Remove old roles from permissions

Change-Id: I54defce2f6ac73268a782f493863647e0773c8f5