remove 'dirty' stuff and add clone method