Take out context save/restore