clean up and more