removed thisServer variable