Remove more state