Updates to remove some deprecated/obsolete references