Cleaned up route grouping.