cleanup and todo