WIP - we may not be able to remove the type of a query...