Remove queries class, no longer needed
Merge branch 'EVENT-24' into dev