and more clean up