[#858] cleanup
[#858] Cleanup
[#2085] Change create mode on copy init
[#2085] Unit test