CLEANUP: remove some files that showed up during the rebase