Remove memory checking