remove comments as quickfix for stable6 only