Removes unused inheritence avoidance hacks

Change-Id: Ied80d8fc3b12aa5503ba6c4f01063cea4f2cf7ea
1 file changed