remove extra commented lines
minor changes