Remove use of copy-construction