More deprecation
WIP: deprecating factories