Clean-up window export