removed uncommented code