Rip out route plotting functionality, and some cleanup.