removed some unuseful commented lines