removing unneeded and obsolete code
removing unnecessary code