rebase quirk removal