Attributes cleanup