#607 removed commented lines