Remove Unnecessary OnButton methods in the button implementations