Revert "Add a new factory"

This reverts commit e9b70f59836f3a81087fea195342b1f51d555113.