refactor so we can deactivate dexterityfields factory