'moved clone methods into own module'