Clean up routes
Merge pull request #30 from theodi/feature-clean-up-routes

Clean up routes