Remove old legacy saved object handling.