Removal of query functionality.