removed unnecessary code parts