Removed a refactoring TODO.