Remove some more Server useages.
Merge pull request #241 from csmith/master

Remove some more Server useages.