remove RAW_SYSTEM CHECK