simplify some server stuff