Removed fixed TODOs