commiting clean up