Cleanup of exports