cleanup to Surf & Paddle