Cleaning up the mess created when rebasing.