Clean Up old code for 2014 Hackathon