more consolidation
removed crappy route