Remove Toolbar requirement