Remove use of 2 deprecated methods

This removes the use of the two methods
This also removes the two methods

Change-Id: Ib8aac31676f2d7c3af6cd658272da871efb98bbd
Merge "Remove use of 2 deprecated methods"