Do not use the Factory
Remove dev config setting