Updated the button removals