ServerList delete/heartbeat; Refactoring;