Removed TODOs and commented out code