Clean up in main load file