Merge "Removes unused inheritence avoidance hacks" into tm-dev