removed TODOs that don't need to be handled