Attributes PR cleanup