Server removal fix