removed some outcommented code