Added support for dropping orphans on copy
Misc cleanup