removed TODOs from comments