Refactored code to remove server2 and server3