Clean up references to toolbarEnabled.