Hamachi Support, Code Cleanup