Remove highly deprecated method

Change-Id: Ic19d6b762df3f53aa6d7668cd3215e53cfdaae12
Merge "Remove highly deprecated method"