Remove TODO comment; we todid this! (I regret this joke already)