Removed unnecessary TODOs