I think that we should be able to drop these attributes now, right?