Spring 2010 Clean Up