Some route cleanup