Removing some obsolete methods and wrapper

Change-Id: I9d3c8d851ad596ba0d5165ab3c0f6661575166fc
1 file changed