Removed State class