Remove parsing of query, replaced with building of query.