Drop Legacy Factories

This is post-0.12 changes. It drops the legacy factory from around the class.
This is a hack to restore internal methods to their unmocked state. In a follow up PR, these internals will be moved off the class instances and therefore they won't get mocked.