Removed more TODOs