Clean up old files
Lots of new code