removed lists and queries from this branch