removed fixed TODOs