Removed some TODOs that are now considered issues