Clean up some TODOs
More clean up