remove ButtonModel, half of it was unused and it was complicating work on buttons.  Can be added later if needed, when we have a button type hierarchy.