removed some uncommented code