updating copy
removing obsolete code