Removing other TODOs