remove commented lines since they are moved above