Finished removing server-specific code.