remove server instanceof