*8746* Cleanup; remove application-specific Role subclass