Swipe cleanup; no longer includes Pan