Maybe needs an upgrade routine to remove the old entries?