Removed hard-coded Servername