Clean up import
Is vanilla possible with this mod load, side tests.