Removed all state from the RayQueryTool class in preparation for larger refactors