rm unused branches
config changes