Removed TODO: wasn't needed