(QENG-807) Remove invalid comments