Remove deprecated cattr_* requires