Fixed error and removed uncommented code