Removed everything related to states