Remove usage of Native