Popover menu is no longer used. Also further cleanup