Cleaning up after combining branches