some clean up for the buttons