Remove dead code
Fix small bug on exporter