Cleaning up TODOs
Removing old files