Hackathon-Cleanup DONE