Removed obsolete comments and TODOs