removal of stores
added state class