removed unnecessary context checks