commit before I clean up