cleaning up various TODOs