Removed excess stuff
Removed TODOs and FIXMEs