More cleanup with accessing the way point manager.