HAL-64: Exclude roles
refactoring done - no errors
wip
wip