remove debugging code, simplify server early exits