Removed simple query path