Remove dead code that should have been removed in e871d3b
Merge branch '4.2/prune-dead-cloning-code'