File loading works OK now
Clean up