Use copy for immutable properties
Removed obsolete code