remove some leftover garbage after rebase