More removal of roles. Still not a working copy