-removed unnecessary code...