removed some outcommented code lines