* removed unnecessary code lines