removed some code lines