Get rid of stale TODO (done now)