Removed rebase stuff