remove not called querys
Merge branch 'issue-40' into develop