Removed some redundant roles, and made the system compile using the new architecture.