Clean up 10_18_2014 10:21pm