More work on connection pruning