updated changes in copy and removed more uneeded code