clean up and add TODOs