Remove old role code