I don't think the TODO is necessary anymore?