Removed some TODOs that won't be done