roles: cleanup