simplify server
no more helper methods