More cleanup - nasty code - but it works.
More cleanup - nasty code - but it works.

amigocloud/modified-tripplanner,amigocloud/modeify,amigocloud/modeify,amigocloud/modified-tripplanner,amigocloud/modeify,amigocloud/modified-tripplanner,amigocloud/modeify,amigocloud/modified-tripplanner