Remove logic from native handler