Now strips comment lines first