remove changes for context