removed all query stuff