Removed the TODOs