clean up and todo