Removed not used states