routes cleaning and fixes