Improve server remove