Clean up for FenuButtonState.cs