Cleaning up old files and preparing to push to master.