Code Cleanup: Roles cleaned