Update for server2 and removal of the alternate port configuration
Merge pull request #6 from AI0867/server2_and_cleanup

Update for server2 and removal of the alternate port configuration