Removed rebase leavings