removed some out commented lines