remove leftovers from rebase party