Removed several TODOs