Remove SAFE_MODE