Revert "Boilerplate New Clone"

This reverts commit 11ae4e63cae7276b6fae28382dd04bb332a588bc.