Remove unnecessary Composition in QueryModel

Signed-off-by: Alex Coles <alex@alexbcoles.com>