Cleanup of client code; debugging connection problems to production machine.