remove comments in query5 api impl