Refactoring around AccountAction
Remove CMS role files