another changes for some deprecated lines

Applying another changes for some deprecated lines