Remove Queries::Base