modify cloning, clean up