Cleanup for master, part 1, WARNING: Incompatible to older blends to to changes in DNA / loader