Fall 2016 Clean up - janclay