Cleanup & peer ping/pong feature