Clean up for browser-policy
Update webapp to new BrowserPolicy