Keystone role cleanup