Got rid of Trip related stuff.  It's easier to simply deal with locations & routes