removed rebase code