Continue cleanup, now for native stuff