HOPKINS: Remove GOTOs in cityMapCarRoute
HOPKINS: Misc refactoring and renaming, remove some dead code