Remove deprecated and unused methods

Change-Id: I9850460980b612f3f87eb1d9489039570ccc15ca