Further simplification of HttpAdminClient