Remove STATE_CHIGIRI

STATE_CHIGIRI is merged into STATE_DROP.