some clean ups on the load file