Clean up a couple TODOs