Removes complete class clone

Refs #6