Cleanup addStateButtons