Removed TODOs without adding new ones! :)