Spring 2011 Clean UP