CAF version: merge search for local particles to remove, with packing

[edoyango]

These two steps were separated when writing the diffusion algorithm, but keeping them separate is no longer necessary.