Revert "New base layer for City Road"

This reverts commit 11ba0d106a396c7ed91844228e02bf48d028aed3.
CityRoad: Last minute changes