Copy cleanup (issue #196)