Cleaned up old exporter code