cleaned up server code, removed keys