remove comment, better partial token detection