More clean-up and consistizing of cloning