Got rid of a few stale TODOs.