Edits to eliminate broken references (??)