More cleanup on viewing trips