remove more unnecessary XXX_INVALID constants