Removed references to affine properties