Remove unused cinder queries