Listening server will now stop when the Server is destroyed
Move unnecessary static functions
Minor cleanup