Add TODO and remove commented out code