[PATCH conductor 2/2] Remove orphaned dictionary entries