Fix server remove and cleanups