Tidy up execution strategy creation inside Query
Remove duplicate lines