Browsing: Route 1 cleanup