States cleanup