removed unnecessary code and code which correspond to deleted code
removed unnecessary code and code which correspond to deleted code