clean up - very good commit