[#198][#199][finished] removed commented lines