cleanup state classes