cleaning up some low hanging TODOs