Browsing: cleanups