remove dead code on criteria and refacto

Sebastien ANDRE requested to merge fix_error_on_storm_query into master

Merge request reports