remove unnecessary context