Remove Strava, clean up WS