remove role code
refactored current manager lookup