removed unused import and commented lines