remove code that's not needed for query system