removed unnecessary TODOs