Cleaned-up clone implementations
working on dogfood