New Zealand targets waterway clean-up