Removing more TODOs