remove some useless (duplicated) SQL queries
To be merged after !71 (merged) (or to be rebased to remove contents of !71 (merged) first)
Edited by Philippe Wang
To be merged after !71 (merged) (or to be rebased to remove contents of !71 (merged) first)