-removed unnecessary code