Cleanup unused junk, comments and TODOs