Fix up load_new and remove some dead code