removed unnecessary ESH classes
added UserState singleton