cleanups on roles/sal