attributes: cleanup