Removed conditional assignment of ServerName

Conditional assignemt of ServerName is unnecessary and has been
removed entirely.