Removed Superfluous code

After some changes, the ButtonAdapter class was no longer needed.

The comments left from the switch refactoring were also removed.