Follow up clean up.

From 634936e7af89fee138a9cf47b34975841b80b898
Merge branch 'LocalPC' into Server