Remove some extraneous copies