remove commented lines
more async message fixes