Clear out old mapping
Handle updating old LCs better