antoniop
committed
on 06 Dec 18
Remove obsolete queries and bring remaining one inline