Fix server removal trigger in cleanup