Took out a TODO that should've been removed a while ago.