Use OptionModel.Options

Remove IdentityOptionsSetup and related config functionality
Fix tests