Fixed cleaning up old branches
merged with upstream