Passage Query. Cleanup Specs