remove unnecessary context blocks