More obsolete and deprecated code updates