Remove some more Server useages.