remove server check