Remove unnecessary context