pruning and refactoring git