BAIN refactor common file removal code for uninstall/anneal

- has the side effect of fixing errors due to naming differences in anneal