remove unnecessary context save call