Config removing, context & request improvements