Got rid of some obsolete todos