commit cleanup