Removed the 'state' useless state buttons