removed commented testing lines