Clean up import/export order