Removed unnecessary context save and restore