Removing units when server goes down should be working