correct state interface. cleanup.