Remove bad rebase stuff