Delete queries_s4 template and adjust products template accordingly.

Signed-off-by: Daira Hopwood <daira@leastauthority.com>