Refactoring: purge needless cloning