Routes cleanup using concern.
Merge pull request #259 from t-bullock/routes-cleanup

Routes cleanup using concern.