Removed Is_attr checks