Deselect indicator when a menu item is clicked

When a menu item is clicked we close the menu and also deselect
the indicator.
Cleanup

Remove leftovers.