cleanup and TODOs