removed spurious copy/move stuff