-Added function removeWaypoint(..)