remove server from non-server branch