cleanup after merging old history