refactor removed Waypoint for ActivityPoint, Plus more static