starting to cleanup the browser-side stuff