Removed a lot of the common sui'-roles.