CB-7018 Clean up and deprecation of some button-related functions