cleaned up unix client and server