removing context for 2.6