We keep mostly the query system. There is probably more to delete but
that's a good start I think.