clean up some todo notices that weren't useful