Just cleaned up some auto-generated TODOs