Revert "Route lines and cosmetics"

This reverts commit dc7988364ad4c1254ee4425966063c1f18c29941.