Remove def and att roles
Refactoring