Comment out context changes