deleted a few commented lines