Trimmed down routes
Fixed merge conflicts