Cleanin up some routing.