Cleanup custom export