Drop Legacy Factories

This is post-0.12 changes. It drops the legacy factory from around the class.
Fixed. CI now passes.