Removing BrowserConstants enums and clean up