try to clean up unnecessary commits