Clean branch while refactoring Branch management