remove extra context vars