Clean up
Removed done TODOs