overhaul listeners
Remove Unused Code
Remove deprecated method
Add additional assertion
Merge pull request #37 from oharaandrew314/overhaul_add_remove_listeners

Overhaul Button Listeners