Emptied state classes and removed interface