gustafn
committed
on 07 Apr 18
reduce usage of depreacted procs