more cleanup
remove commented lines