Remove legacy keystone charm