remove or fix the commented lines