Removed some obsolete todo comments