Fix bug with button states not being updated when called via shortcuts. #225
Remove redundant code caused by previous commits.