Cleanup DS factory to remove autowiring