Doc level-clean up of button Scenarios