rm dep on exporter
less repeating