|#000| refactoring role page - removed duplicate methods