[CLEANUP] ElementBrowser controller classes