Clean up logs and TODOs