removed more TODOs