Update the waypoint expression to be 1-indexed

Also, start the remove target function