Clean up states handled by buttons