commit clean up