Locking/Ping cleanup