Remove of unnecessary cp
Refactoring
update
update