Cleaning
ADD+: remove unnecessary copy.