removed unnecessary code lines