Removed references to legacy file -- fname