Cleanup 2009 - jhitesma