geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [geode] branch develop updated: GEODE-5686: Remove LocalizedStrings
Date Fri, 05 Oct 2018 21:52:33 GMT
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5bccf66  GEODE-5686: Remove LocalizedStrings
5bccf66 is described below

commit 5bccf662d3290f0f64adfa5c888a8a4b656f6369
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
AuthorDate: Fri Oct 5 14:50:38 2018 -0700

    GEODE-5686: Remove LocalizedStrings
    
    This removes the LocalizedStrings class and most uses of LogWriterI18n.
    The I18n interfaces are still in place and still work since they're only
    deprecated but there are no longer any uses of the StringID logging methods.
    
    Going forward everyone should use the Log4j logging facility.  If you
    must use the deprecated LogWriter use that version and not
    LogWriterI18n.
---
 .../geode/modules/util/CreateRegionFunction.java   |    9 +-
 .../web/SwaggerVerificationIntegrationTest.java    |    5 +-
 .../CreateAndLocalDestroyInTXRegressionTest.java   |   15 +-
 .../management/MemoryThresholdsDUnitTest.java      |   99 +-
 .../MemoryThresholdsOffHeapDUnitTest.java          |   39 +-
 .../geode/cache/query/dunit/PDXQueryTestBase.java  |    9 +-
 .../ResourceManagerWithQueryMonitorDUnitTest.java  |   11 +-
 .../partitioned/PRColocatedEquiJoinDUnitTest.java  |    6 +-
 .../apache/geode/cache30/CacheXml66DUnitTest.java  |   35 +-
 .../geode/cache30/CacheXmlGeode10DUnitTest.java    |   24 +-
 .../geode/cache30/ClientServerCCEDUnitTest.java    |    3 +-
 .../apache/geode/cache30/LocalRegionDUnitTest.java |    2 +-
 .../disttx/DistributedTransactionDUnitTest.java    |   78 +-
 .../cache/ClientServerTransactionDUnitTest.java    |    4 +-
 .../internal/cache/ConcurrentMapOpsDUnitTest.java  |    2 +-
 .../cache/DeltaPropagationStatsDUnitTest.java      |    2 +-
 .../cache/P2PDeltaPropagationDUnitTest.java        |    8 +-
 .../internal/cache/RemoteTransactionDUnitTest.java |   16 +-
 .../geode/internal/cache/SizingFlagDUnitTest.java  |   17 +-
 .../execute/MemberFunctionExecutionDUnitTest.java  |   11 +-
 ...ientServerRegionFunctionExecutionDUnitTest.java |    5 +-
 ...egionFunctionExecutionNoSingleHopDUnitTest.java |    5 +-
 ...ctionExecutionSelectorNoSingleHopDUnitTest.java |    5 +-
 ...rRegionFunctionExecutionSingleHopDUnitTest.java |    5 +-
 .../cache/execute/PRColocationDUnitTest.java       |    4 +-
 .../execute/PRFunctionExecutionDUnitTest.java      |   11 +-
 .../partitioned/PartitionResolverDUnitTest.java    |    4 +-
 ...PersistentPartitionedRegionDistributedTest.java |   11 +-
 .../geode/management/QueryDataDUnitTest.java       |   18 +-
 .../ClusterConfigWithoutSecurityDUnitTest.java     |   10 +-
 .../security/SecurityClusterConfigDUnitTest.java   |   14 +-
 .../SecurityWithoutClusterConfigDUnitTest.java     |    8 +-
 .../java/org/apache/geode/TXJUnitTest.java         |   21 +-
 .../DeprecatedAgentLauncherIntegrationTest.java    |    6 +-
 .../internal/ConnectionPoolImplJUnitTest.java      |    4 +-
 .../client/internal/QueueManagerJUnitTest.java     |    4 +-
 .../internal/CompiledGroupBySelectJUnitTest.java   |    7 +-
 .../LocatorLauncherIntegrationTest.java            |   15 +-
 .../ServerLauncherBuilderIntegrationTest.java      |   15 +-
 .../distributed/ServerLauncherIntegrationTest.java |   15 +-
 .../InternalDistributedSystemJUnitTest.java        |   13 +-
 .../cache/PartitionedRegionCreationJUnitTest.java  |    5 +-
 .../cache/control/MemoryMonitorJUnitTest.java      |    7 +-
 .../control/MemoryMonitorOffHeapJUnitTest.java     |    8 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java     |    4 +-
 .../tier/sockets/RedundancyLevelJUnitTest.java     |    4 +-
 .../sockets/ServerConnectionIntegrationTest.java   |   12 -
 .../geode/internal/i18n/BasicI18nJUnitTest.java    |  379 -
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    1 -
 .../codeAnalysis/sanctionedDataSerializables.txt   |    4 +-
 .../geode/internal/ra/spi/JCALocalTransaction.java |    4 +-
 .../src/main/java/org/apache/geode/CopyHelper.java |    7 +-
 .../main/java/org/apache/geode/DataSerializer.java |   16 +-
 .../main/java/org/apache/geode/Instantiator.java   |    9 +-
 .../main/java/org/apache/geode/SystemFailure.java  |   21 +-
 .../java/org/apache/geode/admin/AdminConfig.java   |    6 +-
 .../geode/admin/AdminDistributedSystemFactory.java |    8 +-
 .../main/java/org/apache/geode/admin/Alert.java    |    2 +-
 .../java/org/apache/geode/admin/AlertLevel.java    |    7 +-
 .../geode/admin/DistributedSystemConfig.java       |    4 +-
 .../java/org/apache/geode/admin/GemFireHealth.java |    7 +-
 .../geode/admin/RegionSubRegionSnapshot.java       |    4 +-
 .../admin/internal/AbstractHealthEvaluator.java    |   10 +-
 .../admin/internal/AdminDistributedSystemImpl.java |   96 +-
 .../geode/admin/internal/CacheHealthEvaluator.java |   15 +-
 .../admin/internal/ConfigurationParameterImpl.java |   28 +-
 .../internal/DistributedSystemConfigImpl.java      |   46 +-
 .../internal/DistributedSystemHealthEvaluator.java |    8 +-
 .../internal/DistributedSystemHealthMonitor.java   |   87 +-
 .../internal/DistributionLocatorConfigImpl.java    |    9 +-
 .../admin/internal/DistributionLocatorImpl.java    |    8 +-
 .../internal/EnabledManagedEntityController.java   |   31 +-
 .../admin/internal/GemFireHealthConfigImpl.java    |    8 +-
 .../admin/internal/GemFireHealthEvaluator.java     |    3 +-
 .../geode/admin/internal/GemFireHealthImpl.java    |   20 +-
 .../geode/admin/internal/InetAddressUtil.java      |    4 +-
 .../admin/internal/ManagedEntityConfigImpl.java    |   11 +-
 .../admin/internal/ManagedEntityConfigXml.java     |   11 +-
 .../internal/ManagedEntityConfigXmlGenerator.java  |    7 +-
 .../internal/ManagedEntityConfigXmlParser.java     |   13 +-
 .../admin/internal/MemberHealthEvaluator.java      |   28 +-
 .../admin/internal/StatisticResourceImpl.java      |    5 +-
 .../internal/SystemMemberBridgeServerImpl.java     |    7 +-
 .../admin/internal/SystemMemberCacheImpl.java      |    5 +-
 .../geode/admin/internal/SystemMemberImpl.java     |   14 +-
 .../internal/AdminDistributedSystemJmxImpl.java    |  115 +-
 .../geode/admin/jmx/internal/AgentConfigImpl.java  |  202 +-
 .../apache/geode/admin/jmx/internal/AgentImpl.java |  109 +-
 .../geode/admin/jmx/internal/AgentLauncher.java    |   94 +-
 .../admin/jmx/internal/CacheServerJmxImpl.java     |    8 +-
 .../internal/ConfigurationParameterJmxImpl.java    |    4 +-
 .../jmx/internal/DistributionLocatorJmxImpl.java   |    5 +-
 .../admin/jmx/internal/GemFireHealthJmxImpl.java   |    7 +-
 .../admin/jmx/internal/GenerateMBeanHTML.java      |    7 +-
 .../apache/geode/admin/jmx/internal/MBeanUtil.java |   74 +-
 .../geode/admin/jmx/internal/MX4JModelMBean.java   |   99 +-
 .../geode/admin/jmx/internal/MailManager.java      |   32 +-
 .../jmx/internal/MemberInfoWithStatsMBean.java     |  116 +-
 .../jmx/internal/StatisticResourceJmxImpl.java     |    6 +-
 .../jmx/internal/SystemMemberCacheJmxImpl.java     |    7 +-
 .../geode/admin/jmx/internal/SystemMemberJmx.java  |   19 +-
 .../admin/jmx/internal/SystemMemberJmxImpl.java    |    4 +-
 .../org/apache/geode/cache/AttributesFactory.java  |  143 +-
 .../java/org/apache/geode/cache/CacheFactory.java  |   10 +-
 .../java/org/apache/geode/cache/DataPolicy.java    |    9 +-
 .../geode/cache/DiskWriteAttributesFactory.java    |   30 +-
 .../apache/geode/cache/DynamicRegionFactory.java   |  100 +-
 .../java/org/apache/geode/cache/LossAction.java    |    5 +-
 .../apache/geode/cache/MembershipAttributes.java   |    4 +-
 .../geode/cache/PartitionAttributesFactory.java    |    4 +-
 .../java/org/apache/geode/cache/RegionFactory.java |    5 +-
 .../java/org/apache/geode/cache/RequiredRoles.java |    6 +-
 .../org/apache/geode/cache/ResumptionAction.java   |    7 +-
 .../main/java/org/apache/geode/cache/Scope.java    |    5 +-
 .../internal/AsyncEventQueueFactoryImpl.java       |   12 +-
 .../internal/ParallelAsyncEventQueueImpl.java      |   13 +-
 .../internal/SerialAsyncEventQueueImpl.java        |   15 +-
 .../geode/cache/client/ClientCacheFactory.java     |    3 +-
 .../client/internal/AutoConnectionSourceImpl.java  |   35 +-
 .../client/internal/ClientMetadataService.java     |   22 +-
 .../client/internal/ClientPartitionAdvisor.java    |    5 +-
 .../client/internal/ClientSideHandshakeImpl.java   |    7 +-
 .../client/internal/ConnectionFactoryImpl.java     |   13 +-
 .../cache/client/internal/ConnectionImpl.java      |   10 +-
 .../internal/DataSerializerRecoveryListener.java   |   11 +-
 .../geode/cache/client/internal/DestroyOp.java     |    4 +-
 .../client/internal/ExecuteFunctionNoAckOp.java    |    8 +-
 .../cache/client/internal/ExecuteFunctionOp.java   |    5 +-
 .../internal/ExecuteRegionFunctionNoAckOp.java     |    8 +-
 .../client/internal/GetClientPRMetaDataOp.java     |    5 +-
 .../internal/GetClientPartitionAttributesOp.java   |    5 +-
 .../internal/InstantiatorRecoveryListener.java     |   11 +-
 .../geode/cache/client/internal/PoolImpl.java      |  119 +-
 .../cache/client/internal/QueueManagerImpl.java    |   96 +-
 .../client/internal/RegisterInterestTracker.java   |   17 +-
 .../cache/client/internal/ServerRegionProxy.java   |    9 +-
 .../client/internal/SingleHopClientExecutor.java   |   12 +-
 .../internal/pooling/ConnectionManagerImpl.java    |   66 +-
 .../geode/cache/execute/FunctionService.java       |    4 +-
 .../execute/internal/FunctionServiceManager.java   |   67 +-
 .../cache/partition/PartitionRegionHelper.java     |   19 +-
 .../geode/cache/query/CqAttributesFactory.java     |    7 +-
 .../query/internal/AbstractCompiledValue.java      |   13 +-
 .../internal/AbstractGroupOrRangeJunction.java     |    4 +-
 .../cache/query/internal/AttributeDescriptor.java  |   23 +-
 .../org/apache/geode/cache/query/internal/Bag.java |    6 +-
 .../cache/query/internal/CompiledBindArgument.java |    3 +-
 .../cache/query/internal/CompiledFunction.java     |    4 +-
 .../query/internal/CompiledGroupBySelect.java      |    7 +-
 .../geode/cache/query/internal/CompiledIn.java     |    8 +-
 .../query/internal/CompiledIndexOperation.java     |    8 +-
 .../cache/query/internal/CompiledIteratorDef.java  |   10 +-
 .../cache/query/internal/CompiledJunction.java     |   18 +-
 .../geode/cache/query/internal/CompiledLike.java   |    4 +-
 .../cache/query/internal/CompiledNegation.java     |    3 +-
 .../cache/query/internal/CompiledOperation.java    |    7 +-
 .../geode/cache/query/internal/CompiledRegion.java |    3 +-
 .../geode/cache/query/internal/CompiledSelect.java |   24 +-
 .../cache/query/internal/CompiledUnaryMinus.java   |    5 +-
 .../geode/cache/query/internal/DefaultQuery.java   |   41 +-
 .../cache/query/internal/DefaultQueryService.java  |   61 +-
 .../cache/query/internal/ExecutionContext.java     |   17 +-
 .../geode/cache/query/internal/Functions.java      |   20 +-
 .../cache/query/internal/LinkedResultSet.java      |    4 +-
 .../cache/query/internal/LinkedStructSet.java      |   10 +-
 .../geode/cache/query/internal/MethodDispatch.java |   18 +-
 .../cache/query/internal/PRQueryTraceInfo.java     |    7 +-
 .../cache/query/internal/ProxyQueryService.java    |    5 +-
 .../geode/cache/query/internal/QCompiler.java      |   20 +-
 .../apache/geode/cache/query/internal/QRegion.java |   35 +-
 .../geode/cache/query/internal/QueryMonitor.java   |   11 +-
 .../geode/cache/query/internal/QueryUtils.java     |    5 +-
 .../geode/cache/query/internal/RangeJunction.java  |   28 +-
 .../query/internal/ResultsCollectionWrapper.java   |   10 +-
 .../geode/cache/query/internal/ResultsSet.java     |    4 +-
 .../cache/query/internal/RuntimeIterator.java      |    4 +-
 .../cache/query/internal/SortedResultSet.java      |    4 +-
 .../cache/query/internal/SortedStructBag.java      |   12 +-
 .../cache/query/internal/SortedStructSet.java      |   14 +-
 .../geode/cache/query/internal/StructBag.java      |   24 +-
 .../geode/cache/query/internal/StructImpl.java     |    3 +-
 .../geode/cache/query/internal/StructSet.java      |   19 +-
 .../apache/geode/cache/query/internal/Support.java |    3 +-
 .../cache/query/internal/cq/CqAttributesImpl.java  |   36 +-
 .../cache/query/internal/index/AbstractIndex.java  |    5 +-
 .../query/internal/index/CompactRangeIndex.java    |    3 +-
 .../cache/query/internal/index/DummyQRegion.java   |    3 +-
 .../index/FunctionalIndexCreationHelper.java       |   61 +-
 .../cache/query/internal/index/HashIndex.java      |    3 +-
 .../cache/query/internal/index/IndexManager.java   |   39 +-
 .../query/internal/index/PartitionedIndex.java     |   22 +-
 .../query/internal/index/PrimaryKeyIndex.java      |    6 +-
 .../index/PrimaryKeyIndexCreationHelper.java       |   23 +-
 .../cache/query/internal/index/RangeIndex.java     |   45 +-
 .../cache/query/internal/parse/ASTLiteral.java     |   48 +-
 .../cache/query/internal/parse/ASTUnsupported.java |    3 +-
 .../cache/query/internal/types/StructTypeImpl.java |    5 +-
 .../cache/query/internal/types/TypeUtils.java      |   30 +-
 .../geode/cache/server/internal/LoadMonitor.java   |    9 +-
 .../apache/geode/distributed/AbstractLauncher.java |   28 +-
 .../geode/distributed/DistributedSystem.java       |    5 +-
 .../java/org/apache/geode/distributed/Locator.java |    5 +-
 .../apache/geode/distributed/LocatorLauncher.java  |   91 +-
 .../apache/geode/distributed/ServerLauncher.java   |   94 +-
 .../internal/AbstractDistributionConfig.java       |  590 +-
 .../internal/ClusterDistributionManager.java       |  213 +-
 .../distributed/internal/ClusterElderManager.java  |   10 +-
 .../internal/CollectingReplyProcessor.java         |    5 +-
 .../apache/geode/distributed/internal/DSClock.java |   24 +-
 .../distributed/internal/DistributionAdvisor.java  |    3 +-
 .../distributed/internal/DistributionConfig.java   |    3 +-
 .../internal/DistributionConfigImpl.java           |    7 +-
 .../internal/DistributionConfigSnapshot.java       |    6 +-
 .../distributed/internal/DistributionMessage.java  |   18 +-
 .../internal/FunctionExecutionPooledExecutor.java  |   14 +-
 .../distributed/internal/HealthMonitorImpl.java    |   11 +-
 .../internal/HighPriorityAckedMessage.java         |    8 +-
 .../internal/InternalDistributedSystem.java        |  119 +-
 .../distributed/internal/InternalLocator.java      |   44 +-
 .../internal/LonerDistributionManager.java         |   13 +-
 .../internal/PooledExecutorWithDMStats.java        |   11 +-
 .../geode/distributed/internal/ProductUseLog.java  |    5 +-
 .../internal/ReliableReplyProcessor21.java         |    5 +-
 .../geode/distributed/internal/ReplyException.java |    9 +-
 .../distributed/internal/ReplyProcessor21.java     |   55 +-
 .../geode/distributed/internal/ServerLocator.java  |   15 +-
 .../distributed/internal/ShutdownMessage.java      |    7 +-
 .../geode/distributed/internal/StartupMessage.java |   51 +-
 .../internal/StartupMessageReplyProcessor.java     |    4 +-
 .../distributed/internal/StartupOperation.java     |   19 +-
 .../distributed/internal/direct/DirectChannel.java |   53 +-
 .../distributed/internal/locks/DLockGrantor.java   |   51 +-
 .../locks/DLockRecoverGrantorProcessor.java        |    6 +-
 .../internal/locks/DLockRequestProcessor.java      |   50 +-
 .../distributed/internal/locks/DLockService.java   |   85 +-
 .../distributed/internal/locks/DLockToken.java     |    5 +-
 .../internal/locks/DistributedMemberLock.java      |    3 +-
 .../internal/locks/ElderInitProcessor.java         |   10 +-
 .../distributed/internal/locks/ElderState.java     |   18 +-
 .../internal/locks/GrantorRequestProcessor.java    |    6 +-
 .../distributed/internal/locks/LockGrantorId.java  |    5 +-
 .../membership/InternalDistributedMember.java      |    8 +-
 .../internal/membership/InternalRole.java          |   10 +-
 .../internal/membership/gms/GMSMember.java         |    4 +-
 .../internal/membership/gms/GMSMemberFactory.java  |    3 +-
 .../membership/gms/auth/GMSAuthenticator.java      |   21 +-
 .../membership/gms/locator/GMSLocator.java         |    5 +-
 .../membership/gms/membership/GMSJoinLeave.java    |   11 +-
 .../membership/gms/messenger/JGroupsMessenger.java |   14 +-
 .../membership/gms/mgr/GMSMembershipManager.java   |   95 +-
 .../internal/streaming/StreamingOperation.java     |    3 +-
 .../main/java/org/apache/geode/i18n/StringId.java  |    4 +-
 .../org/apache/geode/internal/AbstractConfig.java  |   31 +-
 .../java/org/apache/geode/internal/Assert.java     |    3 +-
 .../org/apache/geode/internal/AvailablePort.java   |   14 +-
 .../apache/geode/internal/DistributionLocator.java |   35 +-
 .../geode/internal/HeapDataOutputStream.java       |    5 +-
 .../geode/internal/InternalDataSerializer.java     |  131 +-
 .../geode/internal/InternalInstantiator.java       |  123 +-
 .../org/apache/geode/internal/ManagerInfo.java     |   40 +-
 .../java/org/apache/geode/internal/OSProcess.java  |   37 +-
 .../java/org/apache/geode/internal/ObjIdMap.java   |    7 +-
 .../apache/geode/internal/ProcessOutputReader.java |    4 +-
 .../java/org/apache/geode/internal/SmHelper.java   |    9 +-
 .../org/apache/geode/internal/SystemAdmin.java     |  341 +-
 .../org/apache/geode/internal/SystemTimer.java     |    5 +-
 .../apache/geode/internal/UniqueIdGenerator.java   |    9 +-
 .../java/org/apache/geode/internal/Version.java    |    6 +-
 .../apache/geode/internal/VersionDescription.java  |   48 +-
 .../geode/internal/admin/CacheCollector.java       |    7 +-
 .../admin/ClientHealthMonitoringRegion.java        |    5 +-
 .../geode/internal/admin/ClientStatsManager.java   |   15 +-
 .../internal/admin/CompoundEntrySnapshot.java      |    4 +-
 .../internal/admin/CompoundRegionSnapshot.java     |    4 +-
 .../apache/geode/internal/admin/ListenerIdMap.java |    9 +-
 .../geode/internal/admin/StatAlertsManager.java    |   15 +-
 .../admin/remote/AddHealthListenerRequest.java     |    5 +-
 .../admin/remote/AddStatListenerRequest.java       |    3 +-
 .../remote/AdminConsoleDisconnectMessage.java      |   11 +-
 .../geode/internal/admin/remote/AdminRegion.java   |   47 +-
 .../geode/internal/admin/remote/AdminRequest.java  |   12 +-
 .../geode/internal/admin/remote/AdminResponse.java |    5 +-
 .../geode/internal/admin/remote/AdminWaiters.java  |   19 +-
 .../admin/remote/AlertLevelChangeMessage.java      |    5 +-
 .../internal/admin/remote/BridgeServerRequest.java |   20 +-
 .../internal/admin/remote/CacheConfigRequest.java  |    4 +-
 .../geode/internal/admin/remote/CacheDisplay.java  |    4 +-
 .../internal/admin/remote/CacheInfoRequest.java    |    3 +-
 .../admin/remote/CancelStatListenerRequest.java    |    8 +-
 .../admin/remote/CancelStatListenerResponse.java   |    5 +-
 .../internal/admin/remote/CancellationMessage.java |    5 +-
 .../admin/remote/CancellationRegistry.java         |    3 +-
 .../internal/admin/remote/CliLegacyMessage.java    |    9 +-
 .../internal/admin/remote/DestroyEntryMessage.java |   11 +-
 .../admin/remote/DestroyRegionMessage.java         |   11 +-
 .../admin/remote/DistributionLocatorId.java        |   11 +-
 .../internal/admin/remote/EntryValueNodeImpl.java  |    7 +-
 .../admin/remote/FetchDistLockInfoRequest.java     |    7 +-
 .../admin/remote/FetchDistLockInfoResponse.java    |    5 +-
 .../admin/remote/FetchHealthDiagnosisRequest.java  |   11 +-
 .../internal/admin/remote/FetchHostRequest.java    |    7 +-
 .../internal/admin/remote/FetchHostResponse.java   |    7 +-
 .../remote/FetchResourceAttributesRequest.java     |    8 +-
 .../internal/admin/remote/FetchSysCfgRequest.java  |    3 +-
 .../admin/remote/HealthListenerMessage.java        |    5 +-
 .../internal/admin/remote/LicenseInfoRequest.java  |    3 +-
 .../admin/remote/ObjectDetailsRequest.java         |    3 +-
 .../internal/admin/remote/ObjectNamesRequest.java  |    3 +-
 .../remote/PrepareRevokePersistentIDRequest.java   |    6 +-
 .../internal/admin/remote/RegionAdminRequest.java  |    5 +-
 .../admin/remote/RegionAttributesRequest.java      |    3 +-
 .../geode/internal/admin/remote/RegionRequest.java |   11 +-
 .../internal/admin/remote/RegionResponse.java      |    5 +-
 .../internal/admin/remote/RegionSizeRequest.java   |    3 +-
 .../admin/remote/RegionStatisticsRequest.java      |    3 +-
 .../geode/internal/admin/remote/RemoteAlert.java   |    3 +-
 .../internal/admin/remote/RemoteBridgeServer.java  |   25 +-
 .../internal/admin/remote/RemoteCacheInfo.java     |    5 +-
 .../internal/admin/remote/RemoteGemFireVM.java     |   19 +-
 .../admin/remote/RemoteGfManagerAgent.java         |   40 +-
 .../admin/remote/RemoteRegionAttributes.java       |    8 +-
 .../admin/remote/RemoteTransportConfig.java        |    4 +-
 .../admin/remote/RemoveHealthListenerRequest.java  |    3 +-
 .../admin/remote/ResetHealthStatusRequest.java     |    3 +-
 .../internal/admin/remote/RootRegionRequest.java   |    3 +-
 .../internal/admin/remote/StoreSysCfgRequest.java  |    3 +-
 .../internal/admin/remote/SubRegionRequest.java    |    3 +-
 .../internal/admin/remote/TailLogRequest.java      |    3 +-
 .../internal/admin/remote/TailLogResponse.java     |   11 +-
 .../internal/admin/remote/VersionInfoRequest.java  |    3 +-
 .../internal/cache/AbstractBucketRegionQueue.java  |    4 +-
 .../geode/internal/cache/AbstractDiskRegion.java   |   19 +-
 .../geode/internal/cache/AbstractRegion.java       |   86 +-
 .../geode/internal/cache/AbstractRegionMap.java    |    6 +-
 .../internal/cache/AbstractUpdateOperation.java    |    9 +-
 .../apache/geode/internal/cache/BucketAdvisor.java |   50 +-
 .../internal/cache/BucketPersistenceAdvisor.java   |   35 +-
 .../apache/geode/internal/cache/BucketRegion.java  |   26 +-
 .../geode/internal/cache/BucketRegionQueue.java    |    4 +-
 .../apache/geode/internal/cache/CacheConfig.java   |   23 +-
 .../internal/cache/CacheDistributionAdvisor.java   |    5 +-
 .../geode/internal/cache/CacheServerImpl.java      |   27 +-
 .../geode/internal/cache/CacheServerLauncher.java  |  104 +-
 .../cache/CachedDeserializableFactory.java         |   11 +-
 .../cache/ClientSubscriptionConfigImpl.java        |   13 +-
 .../geode/internal/cache/ColocationHelper.java     |   11 +-
 .../geode/internal/cache/ColocationLogger.java     |    8 +-
 .../internal/cache/CreateRegionProcessor.java      |   45 +-
 .../geode/internal/cache/DestroyOperation.java     |    6 +-
 .../cache/DestroyPartitionedRegionMessage.java     |    7 +-
 .../internal/cache/DestroyRegionOperation.java     |   26 +-
 .../org/apache/geode/internal/cache/DiskId.java    |   13 +-
 .../apache/geode/internal/cache/DiskInitFile.java  |   74 +-
 .../geode/internal/cache/DiskStoreFactoryImpl.java |   57 +-
 .../apache/geode/internal/cache/DiskStoreImpl.java |  126 +-
 .../geode/internal/cache/DiskStoreMonitor.java     |   29 +-
 .../internal/cache/DiskWriteAttributesImpl.java    |   34 +-
 .../geode/internal/cache/DistPeerTXStateStub.java  |    9 +-
 .../geode/internal/cache/DistTXCommitMessage.java  |    3 +-
 .../internal/cache/DistTXPrecommitMessage.java     |    4 +-
 .../apache/geode/internal/cache/DistTXState.java   |    6 +-
 .../internal/cache/DistTXStateOnCoordinator.java   |   13 +-
 .../cache/DistTXStateProxyImplOnCoordinator.java   |   40 +-
 .../cache/DistTXStateProxyImplOnDatanode.java      |    4 +-
 .../internal/cache/DistributedCacheOperation.java  |   17 +-
 .../geode/internal/cache/DistributedRegion.java    |  170 +-
 .../DistributedRegionFunctionStreamingMessage.java |   17 +-
 .../cache/DistributedRemoveAllOperation.java       |    4 +-
 .../apache/geode/internal/cache/EntriesSet.java    |   14 +-
 .../geode/internal/cache/EntryEventImpl.java       |   38 +-
 .../apache/geode/internal/cache/EntrySnapshot.java |    7 +-
 .../org/apache/geode/internal/cache/EventID.java   |    9 +-
 .../geode/internal/cache/ExpirationScheduler.java  |    7 +-
 .../apache/geode/internal/cache/ExpiryTask.java    |   10 +-
 .../apache/geode/internal/cache/FilterProfile.java |   17 +-
 .../geode/internal/cache/FilterRoutingInfo.java    |    2 +-
 .../geode/internal/cache/GemFireCacheImpl.java     |  175 +-
 .../org/apache/geode/internal/cache/HARegion.java  |    9 +-
 .../internal/cache/InitialImageFlowControl.java    |   16 +-
 .../internal/cache/InitialImageOperation.java      |   19 +-
 .../apache/geode/internal/cache/InterestEvent.java |    6 +-
 .../org/apache/geode/internal/cache/KeyInfo.java   |    9 +-
 .../geode/internal/cache/LoaderHelperImpl.java     |    8 +-
 .../apache/geode/internal/cache/LocalDataSet.java  |   15 +-
 .../apache/geode/internal/cache/LocalRegion.java   |  340 +-
 .../cache/MemberFunctionStreamingMessage.java      |   18 +-
 .../geode/internal/cache/NonLocalRegionEntry.java  |   91 +-
 .../org/apache/geode/internal/cache/Oplog.java     |  253 +-
 .../apache/geode/internal/cache/OverflowOplog.java |   88 +-
 .../geode/internal/cache/OverflowOplogSet.java     |   13 +-
 .../internal/cache/PRHARedundancyProvider.java     |   70 +-
 .../geode/internal/cache/PRQueryProcessor.java     |    8 +-
 .../internal/cache/PartitionAttributesImpl.java    |   54 +-
 .../cache/PartitionRegionConfigValidator.java      |  148 +-
 .../geode/internal/cache/PartitionedRegion.java    |  434 +-
 .../internal/cache/PartitionedRegionDataStore.java |   81 +-
 .../internal/cache/PartitionedRegionHelper.java    |   66 +-
 .../cache/PartitionedRegionQueryEvaluator.java     |   14 +-
 .../cache/PartitionedRegionRedundancyTracker.java  |    7 +-
 .../geode/internal/cache/PeerTXStateStub.java      |    5 +-
 .../geode/internal/cache/PersistentOplogSet.java   |   23 +-
 .../internal/cache/PlaceHolderDiskRegion.java      |   10 +-
 .../geode/internal/cache/PoolFactoryImpl.java      |    6 +-
 .../geode/internal/cache/PoolManagerImpl.java      |   19 +-
 .../cache/PreferBytesCachedDeserializable.java     |    4 +-
 .../geode/internal/cache/ProxyBucketRegion.java    |    6 +-
 .../geode/internal/cache/ProxyRegionMap.java       |  165 +-
 .../geode/internal/cache/QueuedOperation.java      |   15 +-
 .../geode/internal/cache/RegionEventImpl.java      |    3 +-
 .../geode/internal/cache/RegionNameValidation.java |    9 +-
 .../cache/SearchLoadAndWriteProcessor.java         |   49 +-
 .../geode/internal/cache/ServerPingMessage.java    |   14 +-
 .../geode/internal/cache/StateFlushOperation.java  |   21 +-
 .../cache/StoreAllCachedDeserializable.java        |    3 +-
 .../geode/internal/cache/TXCommitMessage.java      |   23 +-
 .../org/apache/geode/internal/cache/TXEntry.java   |   10 +-
 .../apache/geode/internal/cache/TXEntryState.java  |   50 +-
 .../geode/internal/cache/TXEntryUserAttrState.java |    6 +-
 .../geode/internal/cache/TXFarSideCMTracker.java   |    9 +-
 .../apache/geode/internal/cache/TXManagerImpl.java |   74 +-
 .../org/apache/geode/internal/cache/TXMessage.java |   13 +-
 .../apache/geode/internal/cache/TXRegionState.java |   12 +-
 .../internal/cache/TXRemoteRollbackMessage.java    |    3 +-
 .../geode/internal/cache/TXReservationMgr.java     |    6 +-
 .../org/apache/geode/internal/cache/TXState.java   |   31 +-
 .../geode/internal/cache/TXStateProxyImpl.java     |   26 +-
 .../apache/geode/internal/cache/TXStateStub.java   |   18 +-
 .../geode/internal/cache/TombstoneService.java     |    9 +-
 .../cache/UpdateEntryVersionOperation.java         |    7 +-
 .../geode/internal/cache/UpdateOperation.java      |    8 +-
 .../internal/cache/VMCachedDeserializable.java     |    3 +-
 .../geode/internal/cache/VMLRURegionMap.java       |    9 +-
 .../geode/internal/cache/ValidatingDiskRegion.java |    3 +-
 .../internal/cache/backup/BackupOperation.java     |    3 +-
 .../cache/backup/FileSystemBackupWriter.java       |    4 +-
 .../internal/cache/backup/FinishBackupRequest.java |    4 +-
 .../cache/backup/PrepareBackupRequest.java         |    4 +-
 .../CompressedCachedDeserializable.java            |    7 +-
 .../internal/cache/control/HeapMemoryMonitor.java  |   70 +-
 .../cache/control/InternalResourceManager.java     |   19 +-
 .../internal/cache/control/MemoryThresholds.java   |   10 +-
 .../cache/control/OffHeapMemoryMonitor.java        |   41 +-
 .../internal/cache/control/ResourceAdvisor.java    |    8 +-
 .../cache/entries/AbstractRegionEntry.java         |   26 +-
 .../geode/internal/cache/entries/DiskEntry.java    |   11 +-
 .../cache/eviction/AbstractEvictionList.java       |   14 +-
 .../internal/cache/eviction/CountLRUEviction.java  |    9 +-
 .../internal/cache/eviction/HeapLRUController.java |    6 +-
 .../cache/eviction/LRUListWithAsyncSorting.java    |    5 +-
 .../cache/eviction/LRUListWithSyncSorting.java     |   11 +-
 .../cache/eviction/MemoryLRUController.java        |    5 +-
 .../internal/cache/eviction/OffHeapEvictor.java    |    3 +-
 .../internal/cache/eviction/RegionEvictorTask.java |    4 +-
 .../internal/cache/execute/AbstractExecution.java  |   42 +-
 .../execute/DistributedRegionFunctionExecutor.java |   59 +-
 .../DistributedRegionFunctionResultSender.java     |   22 +-
 .../cache/execute/FunctionExecutionNodePruner.java |    5 +-
 .../execute/FunctionStreamingResultCollector.java  |   24 +-
 .../cache/execute/InternalFunctionService.java     |   14 +-
 .../cache/execute/LocalResultCollectorImpl.java    |    8 +-
 .../cache/execute/MemberFunctionExecutor.java      |   31 +-
 .../cache/execute/MemberFunctionResultSender.java  |   14 +-
 .../cache/execute/MultiRegionFunctionExecutor.java |   35 +-
 .../geode/internal/cache/execute/NoResult.java     |   15 +-
 .../execute/PartitionedRegionFunctionExecutor.java |   33 +-
 .../PartitionedRegionFunctionResultSender.java     |   16 +-
 .../cache/execute/ServerFunctionExecutor.java      |   24 +-
 .../execute/ServerRegionFunctionExecutor.java      |   28 +-
 .../ServerToClientFunctionResultSender.java        |   36 +-
 .../ServerToClientFunctionResultSender65.java      |   29 +-
 .../geode/internal/cache/ha/HARegionQueue.java     |   65 +-
 .../internal/cache/ha/QueueRemovalMessage.java     |   15 +-
 .../internal/cache/locks/TXLockServiceImpl.java    |   27 +-
 .../cache/locks/TXOriginatorRecoveryProcessor.java |   15 +-
 .../locks/TXRecoverGrantorMessageProcessor.java    |   16 +-
 .../cache/partitioned/BucketBackupMessage.java     |    5 +-
 .../cache/partitioned/BucketSizeMessage.java       |   13 +-
 .../cache/partitioned/ContainsKeyValueMessage.java |   21 +-
 .../internal/cache/partitioned/DestroyMessage.java |    3 +-
 .../internal/cache/partitioned/DumpB2NRegion.java  |    4 +-
 .../cache/partitioned/FetchBulkEntriesMessage.java |   23 +-
 .../cache/partitioned/FetchEntriesMessage.java     |   21 +-
 .../cache/partitioned/FetchEntryMessage.java       |   14 +-
 .../cache/partitioned/FetchKeysMessage.java        |   26 +-
 .../internal/cache/partitioned/GetMessage.java     |   15 +-
 .../cache/partitioned/IndexCreationMsg.java        |   20 +-
 .../cache/partitioned/InvalidateMessage.java       |    5 +-
 .../cache/partitioned/ManageBucketMessage.java     |    9 +-
 .../PRFunctionStreamingResultCollector.java        |   18 +-
 .../partitioned/PRUpdateEntryVersionMessage.java   |    3 +-
 .../cache/partitioned/PartitionMessage.java        |   52 +-
 .../PartitionedRegionFunctionStreamingMessage.java |    9 +-
 .../partitioned/PartitionedRegionRebalanceOp.java  |   15 +-
 .../cache/partitioned/PrimaryRequestMessage.java   |    6 +-
 .../internal/cache/partitioned/PutMessage.java     |    5 +-
 .../internal/cache/partitioned/QueryMessage.java   |   16 +-
 .../cache/partitioned/RedundancyLogger.java        |   29 +-
 .../internal/cache/partitioned/RegionAdvisor.java  |   12 +-
 .../cache/partitioned/RemoveIndexesMessage.java    |   25 +-
 .../internal/cache/partitioned/SizeMessage.java    |   15 +-
 .../partitioned/StreamingPartitionOperation.java   |   14 +-
 .../rebalance/ExplicitMoveDirector.java            |   21 +-
 .../rebalance/PercentageMoveDirector.java          |   21 +-
 .../model/PartitionedRegionLoadModel.java          |    8 +-
 .../cache/persistence/DiskInitFileParser.java      |    5 +-
 .../cache/persistence/PersistenceAdvisorImpl.java  |   61 +-
 .../PersistenceInitialImageAdvisor.java            |    4 +-
 .../cache/persistence/PersistentMemberManager.java |   16 +-
 .../cache/snapshot/CacheSnapshotServiceImpl.java   |   12 +-
 .../internal/cache/snapshot/FlowController.java    |   22 +-
 .../geode/internal/cache/snapshot/GFSnapshot.java  |    9 +-
 .../cache/snapshot/RegionSnapshotServiceImpl.java  |   32 +-
 .../internal/cache/snapshot/WindowedExporter.java  |   14 +-
 .../cache/tier/InternalClientMembership.java       |    4 +-
 .../internal/cache/tier/sockets/AcceptorImpl.java  |  120 +-
 .../internal/cache/tier/sockets/BaseCommand.java   |   63 +-
 .../cache/tier/sockets/BaseCommandQuery.java       |   21 +-
 .../cache/tier/sockets/CacheClientNotifier.java    |   98 +-
 .../cache/tier/sockets/CacheClientProxy.java       |  174 +-
 .../cache/tier/sockets/CacheClientUpdater.java     |  121 +-
 .../cache/tier/sockets/CacheServerHelper.java      |    9 +-
 .../cache/tier/sockets/ChunkedMessage.java         |   13 +-
 .../cache/tier/sockets/ClientHealthMonitor.java    |   49 +-
 .../tier/sockets/ClientProxyMembershipID.java      |   38 +-
 .../cache/tier/sockets/ClientUserAuths.java        |   11 +-
 .../internal/cache/tier/sockets/EncryptorImpl.java |   21 +-
 .../internal/cache/tier/sockets/Handshake.java     |   11 +-
 .../geode/internal/cache/tier/sockets/Message.java |   52 +-
 .../cache/tier/sockets/MessageIdExtractor.java     |    5 +-
 .../tier/sockets/OriginalServerConnection.java     |    7 +-
 .../cache/tier/sockets/ServerConnection.java       |   79 +-
 .../tier/sockets/ServerSideHandshakeFactory.java   |    4 +-
 .../tier/sockets/ServerSideHandshakeImpl.java      |   15 +-
 .../cache/tier/sockets/command/ClearRegion.java    |   13 +-
 .../cache/tier/sockets/command/ContainsKey.java    |   20 +-
 .../cache/tier/sockets/command/ContainsKey66.java  |   22 +-
 .../cache/tier/sockets/command/CreateRegion.java   |   22 +-
 .../cache/tier/sockets/command/Default.java        |   13 +-
 .../cache/tier/sockets/command/Destroy.java        |   29 +-
 .../cache/tier/sockets/command/Destroy65.java      |   29 +-
 .../cache/tier/sockets/command/DestroyRegion.java  |   13 +-
 .../tier/sockets/command/ExecuteFunction.java      |   36 +-
 .../tier/sockets/command/ExecuteFunction65.java    |   43 +-
 .../tier/sockets/command/ExecuteFunction66.java    |   72 +-
 .../tier/sockets/command/ExecuteFunction70.java    |    3 +-
 .../sockets/command/ExecuteRegionFunction.java     |   51 +-
 .../sockets/command/ExecuteRegionFunction61.java   |   63 +-
 .../sockets/command/ExecuteRegionFunction65.java   |   71 +-
 .../sockets/command/ExecuteRegionFunction66.java   |   66 +-
 .../command/ExecuteRegionFunctionSingleHop.java    |   49 +-
 .../sockets/command/GatewayReceiverCommand.java    |  161 +-
 .../internal/cache/tier/sockets/command/Get70.java |   19 +-
 .../cache/tier/sockets/command/GetAll.java         |   29 +-
 .../cache/tier/sockets/command/GetAll651.java      |   26 +-
 .../cache/tier/sockets/command/GetAll70.java       |   26 +-
 .../tier/sockets/command/GetAllWithCallback.java   |   30 +-
 .../command/GetClientPRMetadataCommand.java        |   14 +-
 .../command/GetClientPRMetadataCommand66.java      |   14 +-
 .../GetClientPartitionAttributesCommand.java       |   18 +-
 .../GetClientPartitionAttributesCommand66.java     |   16 +-
 .../tier/sockets/command/GetFunctionAttribute.java |    9 +-
 .../cache/tier/sockets/command/Invalid.java        |   11 +-
 .../cache/tier/sockets/command/Invalidate.java     |   26 +-
 .../cache/tier/sockets/command/KeySet.java         |   15 +-
 .../internal/cache/tier/sockets/command/Put.java   |   35 +-
 .../internal/cache/tier/sockets/command/Put61.java |    7 +-
 .../internal/cache/tier/sockets/command/Put65.java |    7 +-
 .../cache/tier/sockets/command/PutAll.java         |   13 +-
 .../cache/tier/sockets/command/PutAll70.java       |   13 +-
 .../cache/tier/sockets/command/PutAll80.java       |   13 +-
 .../tier/sockets/command/PutUserCredentials.java   |    9 +-
 .../sockets/command/RegisterInstantiators.java     |    6 +-
 .../tier/sockets/command/RegisterInterest.java     |   21 +-
 .../tier/sockets/command/RegisterInterest61.java   |   21 +-
 .../tier/sockets/command/RegisterInterestList.java |   23 +-
 .../sockets/command/RegisterInterestList61.java    |   23 +-
 .../sockets/command/RegisterInterestList66.java    |   21 +-
 .../cache/tier/sockets/command/RemoveAll.java      |   18 +-
 .../cache/tier/sockets/command/RemoveUserAuth.java |    9 +-
 .../cache/tier/sockets/command/Request.java        |   19 +-
 .../tier/sockets/command/RequestEventValue.java    |   12 +-
 .../internal/cache/tier/sockets/command/Size.java  |   15 +-
 .../tier/sockets/command/UnregisterInterest.java   |   12 +-
 .../sockets/command/UnregisterInterestList.java    |   12 +-
 .../cache/tx/AbstractPeerTXRegionStub.java         |    9 +-
 .../geode/internal/cache/tx/ClientTXStateStub.java |    3 +-
 .../internal/cache/tx/DistClientTXStateStub.java   |   37 +-
 .../internal/cache/tx/DistributedTXRegionStub.java |   37 +-
 .../internal/cache/tx/PartitionedTXRegionStub.java |   68 +-
 .../internal/cache/tx/RemoteClearMessage.java      |    3 +-
 .../cache/tx/RemoteContainsKeyValueMessage.java    |    9 +-
 .../internal/cache/tx/RemoteDestroyMessage.java    |    3 +-
 .../internal/cache/tx/RemoteFetchEntryMessage.java |    5 +-
 .../internal/cache/tx/RemoteFetchKeysMessage.java  |    6 +-
 .../cache/tx/RemoteFetchVersionMessage.java        |    3 +-
 .../geode/internal/cache/tx/RemoteGetMessage.java  |   13 +-
 .../internal/cache/tx/RemoteInvalidateMessage.java |    5 +-
 .../internal/cache/tx/RemoteOperationMessage.java  |    5 +-
 .../internal/cache/tx/RemotePutAllMessage.java     |    3 +-
 .../geode/internal/cache/tx/RemotePutMessage.java  |    8 +-
 .../internal/cache/tx/RemoteRemoveAllMessage.java  |    3 +-
 .../cache/versions/RegionVersionVector.java        |    7 +-
 .../internal/cache/wan/AbstractGatewaySender.java  |   97 +-
 .../wan/AbstractGatewaySenderEventProcessor.java   |   72 +-
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  113 +-
 .../wan/GatewaySenderEventCallbackDispatcher.java  |   14 +-
 .../internal/cache/wan/GatewaySenderEventImpl.java |    4 +-
 ...aySenderQueueEntrySynchronizationOperation.java |   11 +-
 ...currentParallelGatewaySenderEventProcessor.java |   10 +-
 .../wan/parallel/ParallelGatewaySenderQueue.java   |   50 +-
 .../wan/parallel/ParallelQueueRemovalMessage.java  |   23 +-
 .../cache/wan/serial/BatchDestroyOperation.java    |   14 +-
 ...oncurrentSerialGatewaySenderEventProcessor.java |   11 +-
 .../serial/SerialGatewaySenderEventProcessor.java  |   56 +-
 .../cache/wan/serial/SerialGatewaySenderQueue.java |   31 +-
 .../internal/cache/xmlcache/AbstractXmlParser.java |    5 +-
 .../internal/cache/xmlcache/CacheCreation.java     |  379 +-
 .../cache/xmlcache/CacheServerCreation.java        |    5 +-
 .../xmlcache/CacheTransactionManagerCreation.java  |   43 +-
 .../geode/internal/cache/xmlcache/CacheXml.java    |    7 +-
 .../internal/cache/xmlcache/CacheXmlGenerator.java |   14 +-
 .../internal/cache/xmlcache/CacheXmlParser.java    |  262 +-
 .../cache/xmlcache/CacheXmlPropertyResolver.java   |    7 +-
 .../xmlcache/CacheXmlPropertyResolverHelper.java   |    8 +-
 .../cache/xmlcache/ClientCacheCreation.java        |   33 +-
 .../cache/xmlcache/ClientHaQueueCreation.java      |   13 +-
 .../xmlcache/DiskStoreAttributesCreation.java      |   67 +-
 .../cache/xmlcache/RegionAttributesCreation.java   |  127 +-
 .../internal/cache/xmlcache/RegionCreation.java    |  204 +-
 .../cache/xmlcache/SerializerCreation.java         |    7 +-
 .../internal/datasource/AbstractDataSource.java    |    6 +-
 .../internal/datasource/AbstractPoolCache.java     |    7 +-
 .../datasource/ConnectionPoolCacheImpl.java        |    7 +-
 .../internal/datasource/DataSourceFactory.java     |  108 +-
 .../datasource/FacetsJCAConnectionManagerImpl.java |   27 +-
 .../datasource/GemFireBasicDataSource.java         |   19 +-
 .../datasource/GemFireConnPooledDataSource.java    |   20 +-
 .../datasource/GemFireTransactionDataSource.java   |   15 +-
 .../datasource/JCAConnectionManagerImpl.java       |   26 +-
 .../internal/datasource/ManagedPoolCacheImpl.java  |    4 +-
 .../internal/datasource/TranxPoolCacheImpl.java    |    7 +-
 .../geode/internal/i18n/LocalizedStrings.java      | 7759 --------------------
 .../io/MainWithChildrenRollingFileHandler.java     |   30 +-
 .../geode/internal/io/RollingFileHandler.java      |    5 +-
 .../apache/geode/internal/jndi/ContextImpl.java    |   93 +-
 .../apache/geode/internal/jndi/JNDIInvoker.java    |   37 +-
 .../geode/internal/jta/GlobalTransaction.java      |  121 +-
 .../apache/geode/internal/jta/TransactionImpl.java |   39 +-
 .../geode/internal/jta/TransactionManagerImpl.java |  159 +-
 .../geode/internal/jta/TransactionUtils.java       |   10 +-
 .../geode/internal/jta/UserTransactionImpl.java    |   10 +-
 .../geode/internal/logging/GemFireFormatter.java   |    3 +-
 .../geode/internal/logging/LocalLogWriter.java     |    4 +-
 .../geode/internal/logging/LogFileParser.java      |    7 +-
 .../geode/internal/logging/LogWriterFactory.java   |    8 +-
 .../geode/internal/logging/LogWriterImpl.java      |   13 +-
 .../geode/internal/logging/LoggingThreadGroup.java |  324 +
 .../geode/internal/logging/ManagerLogWriter.java   |    8 +-
 .../geode/internal/logging/MergeLogFiles.java      |   52 +-
 .../geode/internal/logging/PureLogWriter.java      |    9 +-
 .../apache/geode/internal/logging/SortLogFile.java |   16 +-
 .../internal/logging/log4j/LocalizedMessage.java   |   80 -
 .../internal/logging/log4j/LogWriterAppenders.java |   17 +-
 .../internal/monitoring/ThreadsMonitoringImpl.java |    3 +-
 .../apache/geode/internal/net/SocketCreator.java   |   41 +-
 .../geode/internal/offheap/OffHeapStorage.java     |    9 +-
 .../internal/process/FileProcessController.java    |    3 +-
 .../geode/internal/process/StartupStatus.java      |    7 +-
 .../geode/internal/security/AuthorizeRequest.java  |  136 +-
 .../internal/security/AuthorizeRequestPP.java      |   45 +-
 .../statistics/AbstractStatisticsFactory.java      |    3 +-
 .../geode/internal/statistics/ArchiveSplitter.java |   27 +-
 .../internal/statistics/GemFireStatSampler.java    |   14 +-
 .../geode/internal/statistics/HostStatHelper.java  |   25 +-
 .../geode/internal/statistics/HostStatSampler.java |   14 +-
 .../statistics/LocalStatisticsFactory.java         |    6 +-
 .../geode/internal/statistics/ResourceType.java    |    3 +-
 .../geode/internal/statistics/SampleCollector.java |    8 +-
 .../internal/statistics/SimpleStatSampler.java     |    5 +-
 .../internal/statistics/StatArchiveHandler.java    |   42 +-
 .../internal/statistics/StatArchiveReader.java     |   44 +-
 .../internal/statistics/StatArchiveWriter.java     |   70 +-
 .../statistics/StatisticDescriptorImpl.java        |   27 +-
 .../geode/internal/statistics/StatisticsImpl.java  |    9 +-
 .../statistics/StatisticsTypeFactoryImpl.java      |    5 +-
 .../internal/statistics/StatisticsTypeImpl.java    |   19 +-
 .../internal/statistics/StatisticsTypeXml.java     |   30 +-
 .../statistics/platform/LinuxProcFsStatistics.java |    2 +-
 .../internal/stats50/Atomic50StatisticsImpl.java   |   16 +-
 .../geode/internal/tcp/ConnectExceptions.java      |    7 +-
 .../org/apache/geode/internal/tcp/Connection.java  |  490 +-
 .../apache/geode/internal/tcp/ConnectionTable.java |   54 +-
 .../geode/internal/tcp/DirectReplySender.java      |    9 +-
 .../apache/geode/internal/tcp/MsgDestreamer.java   |   12 +-
 .../apache/geode/internal/tcp/MsgOutputStream.java |    7 +-
 .../org/apache/geode/internal/tcp/MsgStreamer.java |    8 +-
 .../apache/geode/internal/tcp/ServerDelegate.java  |    4 +-
 .../org/apache/geode/internal/tcp/TCPConduit.java  |  135 +-
 .../apache/geode/internal/util/Breadcrumbs.java    |    5 +-
 .../org/apache/geode/internal/util/StopWatch.java  |    3 +-
 .../internal/util/concurrent/FutureResult.java     |    7 +-
 .../concurrent/StoppableCountDownOrUpLatch.java    |    3 +-
 .../util/concurrent/StoppableNonReentrantLock.java |    4 +-
 .../geode/management/cli/CommandService.java       |    6 +-
 .../geode/management/internal/JettyHelper.java     |    2 +-
 .../management/internal/JmxManagerAdvisor.java     |    5 +-
 .../geode/management/internal/LocalManager.java    |    2 +-
 .../internal/MXBeanProxyInvocationHandler.java     |    6 +-
 .../management/internal/ManagementFunction.java    |    5 +-
 .../management/internal/ManagementStrings.java     |  195 -
 .../geode/management/internal/NotificationHub.java |    6 +-
 .../internal/SystemManagementService.java          |   22 +-
 .../internal/beans/AsyncEventQueueMBeanBridge.java |    8 +-
 .../internal/beans/DiskStoreMBeanBridge.java       |    5 +-
 .../internal/beans/DistributedSystemBridge.java    |   31 +-
 .../internal/beans/GatewaySenderMBeanBridge.java   |    6 +-
 .../internal/beans/LocatorMBeanBridge.java         |   12 +-
 .../management/internal/beans/MBeanAggregator.java |    6 +-
 .../internal/beans/ManagementListener.java         |    6 +-
 .../internal/beans/MemberMBeanBridge.java          |   32 +-
 .../internal/beans/QueryDataFunction.java          |   35 +-
 .../internal/beans/RegionMBeanBridge.java          |    5 +-
 .../management/internal/beans/ServerBridge.java    |    5 +-
 .../internal/beans/stats/StatsAggregator.java      |    6 +-
 .../geode/management/internal/cli/LogWrapper.java  |    4 +-
 .../internal/cli/commands/CreateRegionCommand.java |   14 +-
 .../cli/functions/RegionCreateFunction.java        |    3 +-
 .../internal/cli/util/DiskStoreCompacter.java      |    7 +-
 .../internal/cli/util/DiskStoreUpgrader.java       |    7 +-
 .../UniversalMembershipListenerAdapter.java        |    5 +-
 .../pdx/internal/AutoSerializableManager.java      |    5 +-
 .../org/apache/geode/pdx/internal/EnumInfo.java    |    5 +-
 .../apache/geode/pdx/internal/PdxInstanceEnum.java |    5 +-
 .../apache/geode/pdx/internal/PdxReaderImpl.java   |    9 +-
 .../apache/geode/pdx/internal/TypeRegistry.java    |    9 +-
 .../org/apache/geode/redis/GeodeRedisServer.java   |    3 +-
 .../internal/ServerLocatorJUnitTest.java           |    4 +-
 .../GMSAuthenticatorWithAuthenticatorTest.java     |   12 -
 .../GMSAuthenticatorWithSecurityManagerTest.java   |   12 -
 .../geode/internal/GemFireVersionJUnitTest.java    |    9 +-
 .../geode/internal/cache/ColocationHelperTest.java |   16 +-
 .../internal/cache/RegionNameValidationTest.java   |   13 +-
 .../internal/cache/tier/sockets/HandshakeTest.java |    3 +-
 .../cache/tier/sockets/ServerConnectionTest.java   |   15 +-
 .../logging/log4j/LocalizedMessageJUnitTest.java   |   56 -
 .../geode/internal/process/StartupStatusTest.java  |   13 +-
 .../RollingUpgrade2DUnitTestBase.java              |    4 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java     |    5 +-
 .../cache/query/dunit/PdxQueryCQTestBase.java      |   15 +-
 .../geode/internal/cache/PutAllCSDUnitTest.java    |   46 +-
 .../cache/RemoteCQTransactionDUnitTest.java        |    2 +-
 .../tier/sockets/ClientToServerDeltaDUnitTest.java |    6 +-
 .../tier/sockets/DurableClientCQDUnitTest.java     |   25 +-
 .../geode/security/FilterPostAuthorization.java    |   20 +-
 .../geode/security/FilterPreAuthorization.java     |    6 +-
 .../cache/query/internal/cq/ClientCQImpl.java      |   54 +-
 .../query/internal/cq/CqAttributesMutatorImpl.java |    7 +-
 .../cache/query/internal/cq/CqConflatable.java     |    3 +-
 .../geode/cache/query/internal/cq/CqEventImpl.java |    4 +-
 .../cache/query/internal/cq/CqListenerImpl.java    |    5 +-
 .../geode/cache/query/internal/cq/CqQueryImpl.java |   32 +-
 .../cache/query/internal/cq/CqServiceImpl.java     |  110 +-
 .../cache/query/internal/cq/ServerCQImpl.java      |   30 +-
 .../cache/tier/sockets/command/CloseCQ.java        |    7 +-
 .../cache/tier/sockets/command/ExecuteCQ.java      |    3 +-
 .../cache/tier/sockets/command/ExecuteCQ61.java    |    6 +-
 .../cache/tier/sockets/command/MonitorCQ.java      |   16 +-
 .../cache/tier/sockets/command/StopCQ.java         |    7 +-
 .../query/internal/cq/CqServiceImplJUnitTest.java  |    3 +-
 .../java/batterytest/greplogs/ExpectedStrings.java |    2 +
 .../org/apache/geode/management/MBeanUtil.java     |   16 +-
 .../cli/commands/QueryCommandDUnitTestBase.java    |    6 +-
 .../geode/cache/query/data/PortfolioPdx.java       |    4 +-
 .../apache/geode/cache/query/data/PositionPdx.java |    6 +-
 .../internal/logging/TestLogWriterFactory.java     |   19 +-
 .../cache/lucene/LuceneIndexCreationDUnitTest.java |    6 +-
 .../cache/lucene/LuceneIndexDestroyDUnitTest.java  |    6 +-
 .../cli/DestroyLuceneIndexCommandsDUnitTest.java   |    9 +-
 .../cli/LuceneIndexCommandsIntegrationTest.java    |   13 +-
 .../cache/lucene/LuceneIndexExistsException.java   |    5 +-
 .../CreateLuceneCommandParametersValidator.java    |    5 +-
 .../lucene/internal/DestroyLuceneIndexMessage.java |    5 +-
 .../internal/LuceneIndexCreationProfile.java       |   45 +-
 .../internal/LuceneIndexForPartitionedRegion.java  |    5 +-
 .../cache/lucene/internal/LuceneIndexImpl.java     |    3 +-
 .../lucene/internal/LuceneRegionListener.java      |    5 +-
 .../cache/lucene/internal/LuceneServiceImpl.java   |   44 +-
 .../cache/lucene/internal/StringQueryProvider.java |    5 +-
 .../internal/distributed/LuceneQueryFunction.java  |    7 +-
 .../lucene/internal/xml/LuceneIndexCreation.java   |    5 +-
 .../cache/lucene/internal/xml/LuceneXmlParser.java |    7 +-
 .../security/SecureFunctionServiceImpl.java        |    5 +-
 .../wan/misc/NewWanAuthenticationDUnitTest.java    |    4 +-
 .../cache/wan/misc/WANConfigurationJUnitTest.java  |    4 +-
 .../client/internal/GatewaySenderBatchOp.java      |    5 +-
 .../internal/locator/wan/LocatorDiscovery.java     |   46 +-
 .../locator/wan/LocatorMembershipListenerImpl.java |   14 +-
 .../cache/wan/AbstractRemoteGatewaySender.java     |   44 +-
 .../cache/wan/GatewayReceiverFactoryImpl.java      |    4 +-
 .../internal/cache/wan/GatewayReceiverImpl.java    |   14 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java    |  101 +-
 .../cache/wan/GatewaySenderFactoryImpl.java        |   44 +-
 .../wan/parallel/ParallelGatewaySenderImpl.java    |   13 +-
 .../cache/wan/serial/SerialGatewaySenderImpl.java  |   15 +-
 .../internal/web/swagger/config/SwaggerConfig.java |   15 +-
 .../cli/commands/AlterRuntimeCommandDUnitTest.java |   14 +-
 806 files changed, 9470 insertions(+), 19665 deletions(-)

diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
index 99e0c44..73288ff 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
@@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalRegionArguments;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.management.internal.security.ResourcePermissions;
 import org.apache.geode.security.ResourcePermission;
 
@@ -106,8 +105,7 @@ public class CreateRegionFunction implements Function, Declarable, DataSerializa
         RegionHelper.validateRegion(this.cache, configuration, region);
       } catch (Exception e) {
         if (!e.getMessage()
-            .equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME
-                .toLocalizedString())) {
+            .equals("CacheListeners are not the same")) {
           this.cache.getLogger().warning(e);
         }
         status = RegionStatus.INVALID;
@@ -184,8 +182,7 @@ public class CreateRegionFunction implements Function, Declarable, DataSerializa
           RegionHelper.validateRegion(this.cache, configuration, region);
         } catch (Exception e) {
           if (!e.getMessage()
-              .equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME
-                  .toLocalizedString())) {
+              .equals("CacheListeners are not the same")) {
             this.cache.getLogger().warning(e);
           }
           status = RegionStatus.INVALID;
@@ -229,7 +226,7 @@ public class CreateRegionFunction implements Function, Declarable, DataSerializa
       return gemFireCache.createVMRegion(REGION_CONFIGURATION_METADATA_REGION, ra, ira);
     } catch (IOException | ClassNotFoundException e) {
       InternalGemFireError assErr = new InternalGemFireError(
-          LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
+          "unexpected exception");
       assErr.initCause(e);
       throw assErr;
     }
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
index 104c179..9879f1f 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
@@ -25,7 +25,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.security.SimpleTestSecurityManager;
 import org.apache.geode.test.junit.categories.RestAPITest;
 import org.apache.geode.test.junit.categories.SecurityTest;
@@ -58,9 +57,9 @@ public class SwaggerVerificationIntegrationTest {
 
     JsonNode info = json.get("info");
     assertThat(info.get("description").asText(),
-        is(LocalizedStrings.SwaggerConfig_DESCRIPTOR.toLocalizedString()));
+        is("Developer REST API and interface to Geode's distributed, in-memory data grid and cache."));
     assertThat(info.get("title").asText(),
-        is(LocalizedStrings.SwaggerConfig_VENDOR_PRODUCT_LINE.toLocalizedString()));
+        is("Apache Geode Developer REST API"));
 
     JsonNode license = info.get("license");
     assertThat(license.get("name").asText(), is("Apache License, version 2.0"));
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
index 64055d2..dc668b7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
@@ -16,8 +16,6 @@ package org.apache.geode.cache;
 
 import static org.apache.geode.cache.RegionShortcut.REPLICATE;
 import static org.apache.geode.cache.RegionShortcut.REPLICATE_PROXY;
-import static org.apache.geode.internal.i18n.LocalizedStrings.TXStateStub_LOCAL_DESTROY_NOT_ALLOWED_IN_TRANSACTION;
-import static org.apache.geode.internal.i18n.LocalizedStrings.TXStateStub_LOCAL_INVALIDATE_NOT_ALLOWED_IN_TRANSACTION;
 import static org.apache.geode.test.dunit.VM.getVM;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -38,7 +36,6 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 
 import org.apache.geode.cache.Region.Entry;
-import org.apache.geode.i18n.StringId;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.rules.CacheRule;
 import org.apache.geode.test.dunit.rules.DistributedRule;
@@ -124,16 +121,16 @@ public class CreateAndLocalDestroyInTXRegressionTest implements Serializable {
 
   private enum LocalOperation {
     LOCAL_DESTROY((region) -> region.localDestroy(KEY),
-        TXStateStub_LOCAL_DESTROY_NOT_ALLOWED_IN_TRANSACTION),
+        "localDestroy() is not allowed in a transaction"),
     LOCAL_INVALIDATE((region) -> region.localInvalidate(KEY),
-        TXStateStub_LOCAL_INVALIDATE_NOT_ALLOWED_IN_TRANSACTION);
+        "localInvalidate() is not allowed in a transaction");
 
     private final Consumer<Region<String, String>> strategy;
-    private final StringId stringId;
+    private final String message;
 
-    LocalOperation(final Consumer<Region<String, String>> strategy, final StringId stringId) {
+    LocalOperation(final Consumer<Region<String, String>> strategy, final String message) {
       this.strategy = strategy;
-      this.stringId = stringId;
+      this.message = message;
     }
 
     void invoke(final Region<String, String> region) {
@@ -141,7 +138,7 @@ public class CreateAndLocalDestroyInTXRegressionTest implements Serializable {
     }
 
     String getMessage() {
-      return stringId.toLocalizedString();
+      return message;
     }
   }
 }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index 44d6e05..19d60d4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -88,7 +88,6 @@ import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState;
 import org.apache.geode.internal.cache.control.ResourceAdvisor;
 import org.apache.geode.internal.cache.control.ResourceListener;
 import org.apache.geode.internal.cache.control.TestMemoryThresholdListener;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.statistics.GemFireStatSampler;
 import org.apache.geode.internal.statistics.LocalStatListener;
 import org.apache.geode.test.dunit.Assert;
@@ -147,14 +146,12 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     }
   }
 
-  final String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
-      .getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
+  final String expectedEx = "Member: .*? above .*? critical threshold";
   final String addExpectedExString =
       "<ExpectedException action=add>" + expectedEx + "</ExpectedException>";
   final String removeExpectedExString =
       "<ExpectedException action=remove>" + expectedEx + "</ExpectedException>";
-  final String expectedBelow = LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD
-      .getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
+  final String expectedBelow = "Member: .*? below .*? critical threshold";
   final String addExpectedBelow =
       "<ExpectedException action=add>" + expectedBelow + "</ExpectedException>";
   final String removeExpectedBelow =
@@ -206,10 +203,10 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
         InternalResourceManager irm = (InternalResourceManager) getCache().getResourceManager();
         irm.setCriticalHeapPercentage(90f);
 
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         HeapMemoryMonitor.setTestBytesUsedForThresholdSet(950);
         irm.getHeapMonitor().updateStateAndSendEvent();
-        getCache().getLoggerI18n().fine(removeExpectedExString);
+        getCache().getLogger().fine(removeExpectedExString);
         return null;
       }
     });
@@ -458,9 +455,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     server2.invoke(new SerializableCallable("NORMAL->CRITICAL") {
       public Object call() throws Exception {
         InternalCache gfCache = getCache();
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         gfCache.getInternalResourceManager().getHeapMonitor().updateStateAndSendEvent(950);
-        getCache().getLoggerI18n().fine(removeExpectedExString);
+        getCache().getLogger().fine(removeExpectedExString);
         return null;
       }
     });
@@ -477,9 +474,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     server2.invoke(new SerializableCallable("CRITICAL->EVICTION") {
       public Object call() throws Exception {
         InternalCache gfCache = getCache();
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         gfCache.getInternalResourceManager().getHeapMonitor().updateStateAndSendEvent(850);
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         return null;
       }
     });
@@ -954,9 +951,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     server1.invoke(new SerializableCallable() {
       public Object call() throws Exception {
         try {
-          getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+          getCache().getLogger().fine(addExpectedFunctionExString);
           FunctionService.onRegion(getRootRegion().getSubregion(regionName)).execute(function);
-          getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+          getCache().getLogger().fine(removeExpectedFunctionExString);
           fail("expected low memory exception was not thrown");
         } catch (LowMemoryException e) {
           // expected
@@ -969,9 +966,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     server1.invoke(new SerializableCallable() {
       public Object call() throws Exception {
         try {
-          getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+          getCache().getLogger().fine(addExpectedFunctionExString);
           FunctionService.onMembers().execute(function);
-          getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+          getCache().getLogger().fine(removeExpectedFunctionExString);
           fail("expected low memory exception was not thrown");
         } catch (LowMemoryException e) {
           // expected
@@ -983,9 +980,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     client.invoke(new SerializableCallable() {
       public Object call() throws Exception {
         try {
-          getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+          getCache().getLogger().fine(addExpectedFunctionExString);
           FunctionService.onRegion(getRootRegion().getSubregion(regionName)).execute(function);
-          getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+          getCache().getLogger().fine(removeExpectedFunctionExString);
           fail("expected low memory exception was not thrown");
         } catch (FunctionException e) {
           if (!(e.getCause().getCause() instanceof LowMemoryException)) {
@@ -1077,9 +1074,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     accessor.invoke(new SerializableCallable() {
       public Object call() throws Exception {
         try {
-          getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+          getCache().getLogger().fine(addExpectedFunctionExString);
           FunctionService.onRegion(getRootRegion().getSubregion(regionName)).execute(function);
-          getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+          getCache().getLogger().fine(removeExpectedFunctionExString);
           fail("expected low memory exception was not thrown");
         } catch (LowMemoryException e) {
           // expected
@@ -1092,9 +1089,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     accessor.invoke(new SerializableCallable() {
       public Object call() throws Exception {
         try {
-          getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+          getCache().getLogger().fine(addExpectedFunctionExString);
           FunctionService.onMembers().execute(function);
-          getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+          getCache().getLogger().fine(removeExpectedFunctionExString);
           fail("expected low memory exception was not thrown");
         } catch (LowMemoryException e) {
           // expected
@@ -1151,9 +1148,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
               s.add(sickKey1);
               Execution e = FunctionService.onRegion(pr);
               try {
-                getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+                getCache().getLogger().fine(addExpectedFunctionExString);
                 e.withFilter(s).setArguments((Serializable) s).execute(function);
-                getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+                getCache().getLogger().fine(removeExpectedFunctionExString);
                 fail("expected LowMemoryExcception was not thrown");
               } catch (LowMemoryException ex) {
                 // expected
@@ -1436,11 +1433,11 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   private void setUsageAboveCriticalThreshold(VM vm) {
     vm.invoke(new SerializableCallable() {
       public Object call() throws Exception {
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         ((GemFireCacheImpl) getCache()).getInternalResourceManager().getHeapMonitor()
             .updateStateAndSendEvent(950);
         HeapMemoryMonitor.setTestBytesUsedForThresholdSet(950);
-        getCache().getLoggerI18n().fine(removeExpectedExString);
+        getCache().getLogger().fine(removeExpectedExString);
         return null;
       }
     });
@@ -1449,11 +1446,11 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   private void setUsageAboveEvictionThreshold(VM vm) {
     vm.invoke(new SerializableCallable() {
       public Object call() throws Exception {
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         HeapMemoryMonitor.setTestBytesUsedForThresholdSet(850);
         ((GemFireCacheImpl) getCache()).getInternalResourceManager().getHeapMonitor()
             .updateStateAndSendEvent(850);
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         return null;
       }
     });
@@ -1462,10 +1459,10 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   private void setUsageBelowEviction(VM vm) {
     vm.invoke(new SerializableCallable() {
       public Object call() throws Exception {
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         ((GemFireCacheImpl) getCache()).getInternalResourceManager().getHeapMonitor()
             .updateStateAndSendEvent(750);
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         return null;
       }
     });
@@ -1849,14 +1846,14 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
         r.getAll(createRanges(10, 12));
         assertEquals(expectedInvocations++, numLoaderInvocations.get());
 
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         fakeHeapUsage = Math.round(fakeHeapMaxSize * (criticalHeapThresh + 0.1f)); // usage above
                                                                                    // critical by
                                                                                    // 10%
         assertTrue(fakeHeapUsage > 0);
         assertTrue(fakeHeapUsage <= fakeHeapMaxSize);
         hmm.updateStateAndSendEvent(fakeHeapUsage);
-        getCache().getLoggerI18n().fine(removeExpectedExString);
+        getCache().getLogger().fine(removeExpectedExString);
 
         assertTrue(hmm.getState().isCritical());
         {
@@ -1872,9 +1869,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
         fakeHeapUsage = Math.round(fakeHeapMaxSize * (criticalHeapThresh - 0.3f)); // below critical
                                                                                    // by 30%
         assertTrue(fakeHeapMaxSize > 0);
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         hmm.updateStateAndSendEvent(fakeHeapUsage);
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         assertFalse(hmm.getState().isCritical());
         {
           Integer k = new Integer(3);
@@ -2030,9 +2027,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
                                                                                           // critical
                                                                                           // by 30%
             assertTrue(fakeHeapMaxSize > 0);
-            getCache().getLoggerI18n().fine(addExpectedBelow);
+            getCache().getLogger().fine(addExpectedBelow);
             hmm.updateStateAndSendEvent(newfakeHeapUsage);
-            getCache().getLoggerI18n().fine(removeExpectedBelow);
+            getCache().getLogger().fine(removeExpectedBelow);
             assertFalse(hmm.getState().isCritical());
             {
               Integer k = new Integer(3);
@@ -2096,9 +2093,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
                                                                                       // critical by
                                                                                       // 30%
         assertTrue(fakeHeapMaxSize > 0);
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         hmm.updateStateAndSendEvent(newfakeHeapUsage);
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         assertFalse(hmm.getState().isCritical());
         {
           Integer k = new Integer(6);
@@ -2263,9 +2260,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
                                                                                               // by
                                                                                               // 30%
             assertTrue(fakeHeapMaxSize > 0);
-            getCache().getLoggerI18n().fine(addExpectedBelow);
+            getCache().getLogger().fine(addExpectedBelow);
             hmm.updateStateAndSendEvent(newfakeHeapUsage);
-            getCache().getLoggerI18n().fine(removeExpectedBelow);
+            getCache().getLogger().fine(removeExpectedBelow);
             assertFalse(hmm.getState().isCritical());
             Integer k = new Integer(3); // same key as previously used, this time is should stick
             Integer expectedInvocations8 = new Integer(expectedInvocations.incrementAndGet());
@@ -2291,7 +2288,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
         assertEquals(k.toString(), r.get(k, expectedInvocations9)); // no load
 
         // Go critical in accessor
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         long newfakeHeapUsage = Math.round(fakeHeapMaxSize * (criticalHeapThresh + 0.1f)); // usage
                                                                                            // above
                                                                                            // critical
@@ -2299,7 +2296,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
         assertTrue(newfakeHeapUsage > 0);
         assertTrue(newfakeHeapUsage <= fakeHeapMaxSize);
         hmm.updateStateAndSendEvent(newfakeHeapUsage);
-        getCache().getLoggerI18n().fine(removeExpectedExString);
+        getCache().getLogger().fine(removeExpectedExString);
         assertTrue(hmm.getState().isCritical());
         k = new Integer(5);
         Integer expectedInvocations10 = new Integer(expectedInvocations.incrementAndGet());
@@ -2312,9 +2309,9 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
                                                                                       // critical by
                                                                                       // 30%
         assertTrue(fakeHeapMaxSize > 0);
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         hmm.updateStateAndSendEvent(newfakeHeapUsage);
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         assertFalse(hmm.getState().isCritical());
         return expectedInvocations10;
       }
@@ -2373,28 +2370,28 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
 
   private SerializableRunnable addExpectedException = new SerializableRunnable("addExpectedEx") {
     public void run() {
-      getCache().getLoggerI18n().fine(addExpectedExString);
+      getCache().getLogger().fine(addExpectedExString);
     };
   };
 
   private SerializableRunnable removeExpectedException =
       new SerializableRunnable("removeExpectedException") {
         public void run() {
-          getCache().getLoggerI18n().fine(removeExpectedExString);
+          getCache().getLogger().fine(removeExpectedExString);
         };
       };
 
   private SerializableRunnable addExpectedFunctionException =
       new SerializableRunnable("addExpectedFunctionException") {
         public void run() {
-          getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+          getCache().getLogger().fine(addExpectedFunctionExString);
         };
       };
 
   private SerializableRunnable removeExpectedFunctionException =
       new SerializableRunnable("removeExpectedFunctionException") {
         public void run() {
-          getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+          getCache().getLogger().fine(removeExpectedFunctionExString);
         };
       };
 
@@ -2416,13 +2413,13 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
           hmm.updateStateAndSendEvent(96);
           assertFalse(hmm.getState().isCritical());
         }
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         hmm.updateStateAndSendEvent(96);
         assertTrue(hmm.getState().isCritical());
-        getCache().getLoggerI18n().fine(removeExpectedExString);
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(removeExpectedExString);
+        getCache().getLogger().fine(addExpectedBelow);
         hmm.updateStateAndSendEvent(92);
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         assertFalse(hmm.getState().isCritical());
         HeapMemoryMonitor.setTestDisableMemoryUpdates(true);
         return null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 907456c..f7b8fd7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -76,7 +76,6 @@ import org.apache.geode.internal.cache.control.ResourceAdvisor;
 import org.apache.geode.internal.cache.control.ResourceListener;
 import org.apache.geode.internal.cache.control.TestMemoryThresholdListener;
 import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.DistributedTestUtils;
@@ -100,14 +99,12 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
 @Category({OffHeapTest.class})
 public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
 
-  final String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
-      .getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
+  final String expectedEx = "Member: .*? above .*? critical threshold";
   final String addExpectedExString =
       "<ExpectedException action=add>" + this.expectedEx + "</ExpectedException>";
   final String removeExpectedExString =
       "<ExpectedException action=remove>" + this.expectedEx + "</ExpectedException>";
-  final String expectedBelow = LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD
-      .getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
+  final String expectedBelow = "Member: .*? below .*? critical threshold";
   final String addExpectedBelow =
       "<ExpectedException action=add>" + this.expectedBelow + "</ExpectedException>";
   final String removeExpectedBelow =
@@ -291,14 +288,14 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
   private void setUsageAboveCriticalThreshold(final VM vm, final String regionName) {
     vm.invoke(new SerializableCallable() {
       public Object call() throws Exception {
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         Region region = getRootRegion().getSubregion(regionName);
         if (!region.containsKey("oh1")) {
           region.put("oh5", new byte[954204]);
         } else {
           region.put("oh5", new byte[122880]);
         }
-        getCache().getLoggerI18n().fine(removeExpectedExString);
+        getCache().getLogger().fine(removeExpectedExString);
         return null;
       }
     });
@@ -307,13 +304,13 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
   private void setUsageAboveEvictionThreshold(final VM vm, final String regionName) {
     vm.invoke(new SerializableCallable() {
       public Object call() throws Exception {
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         Region region = getRootRegion().getSubregion(regionName);
         region.put("oh1", new byte[245760]);
         region.put("oh2", new byte[184320]);
         region.put("oh3", new byte[33488]);
         region.put("oh4", new byte[378160]);
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         return null;
       }
     });
@@ -322,14 +319,14 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
   private void setUsageBelowEviction(final VM vm, final String regionName) {
     vm.invoke(new SerializableCallable() {
       public Object call() throws Exception {
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         Region region = getRootRegion().getSubregion(regionName);
         region.remove("oh1");
         region.remove("oh2");
         region.remove("oh3");
         region.remove("oh4");
         region.remove("oh5");
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         return null;
       }
     });
@@ -724,16 +721,16 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
 
   private SerializableRunnable addExpectedException = new SerializableRunnable("addExpectedEx") {
     public void run() {
-      getCache().getLoggerI18n().fine(addExpectedExString);
-      getCache().getLoggerI18n().fine(addExpectedBelow);
+      getCache().getLogger().fine(addExpectedExString);
+      getCache().getLogger().fine(addExpectedBelow);
     };
   };
 
   private SerializableRunnable removeExpectedException =
       new SerializableRunnable("removeExpectedException") {
         public void run() {
-          getCache().getLoggerI18n().fine(removeExpectedExString);
-          getCache().getLoggerI18n().fine(removeExpectedBelow);
+          getCache().getLogger().fine(removeExpectedExString);
+          getCache().getLogger().fine(removeExpectedBelow);
         };
       };
 
@@ -1225,10 +1222,10 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
         r.getAll(createRanges(10, 12));
         assertEquals(expectedInvocations++, numLoaderInvocations.get());
 
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         r.put("oh1", new byte[838860]);
         r.put("oh3", new byte[157287]);
-        getCache().getLoggerI18n().fine(removeExpectedExString);
+        getCache().getLogger().fine(removeExpectedExString);
         WaitCriterion wc = new WaitCriterion() {
           public String description() {
             return "expected region " + r + " to set memoryThresholdReached";
@@ -1249,9 +1246,9 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
         r.getAll(createRanges(13, 15));
         assertEquals(expectedInvocations++, numLoaderInvocations.get());
 
-        getCache().getLoggerI18n().fine(addExpectedBelow);
+        getCache().getLogger().fine(addExpectedBelow);
         r.destroy("oh3");
-        getCache().getLoggerI18n().fine(removeExpectedBelow);
+        getCache().getLogger().fine(removeExpectedBelow);
         wc = new WaitCriterion() {
           public String description() {
             return "expected region " + r + " to unset memoryThresholdReached";
@@ -1449,7 +1446,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
         InternalResourceManager irm = ((GemFireCacheImpl) getCache()).getInternalResourceManager();
         final OffHeapMemoryMonitor ohm = irm.getOffHeapMonitor();
         assertTrue(ohm.getState().isNormal());
-        getCache().getLoggerI18n().fine(addExpectedExString);
+        getCache().getLogger().fine(addExpectedExString);
         final LocalRegion r = (LocalRegion) getRootRegion().getSubregion(regionName);
         final long bytesUsedAfterSmallKey;
         {
@@ -1524,7 +1521,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
           };
         }
         Wait.waitForCriterion(wc, 30000, 9, true);
-        getCache().getLoggerI18n().fine(removeExpectedExString);
+        getCache().getLogger().fine(removeExpectedExString);
         return bytesUsedAfterSmallKey;
       }
     });
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
index c394dfb..47036df 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
@@ -45,7 +45,6 @@ import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.cache30.CacheSerializableRunnable;
 import org.apache.geode.compression.Compressor;
 import org.apache.geode.compression.SnappyCompressor;
-import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.pdx.PdxReader;
 import org.apache.geode.pdx.PdxSerializable;
@@ -173,7 +172,7 @@ public abstract class PDXQueryTestBase extends JUnit4CacheTestCase {
   public void printResults(SelectResults results, String message) {
     Object r;
     Struct s;
-    LogWriterI18n logger = GemFireCacheImpl.getInstance().getLoggerI18n();
+    LogWriter logger = GemFireCacheImpl.getInstance().getLogger();
     logger.fine(message);
     int row = 0;
     for (Iterator iter = results.iterator(); iter.hasNext();) {
@@ -327,7 +326,7 @@ public abstract class PDXQueryTestBase extends JUnit4CacheTestCase {
 
     @Override
     public boolean equals(Object o) {
-      GemFireCacheImpl.getInstance().getLoggerI18n()
+      GemFireCacheImpl.getInstance().getLogger()
           .fine("In TestObject2.equals() this: " + this + " other :" + o);
       TestObject2 other = (TestObject2) o;
       if (_id == other._id) {
@@ -339,7 +338,7 @@ public abstract class PDXQueryTestBase extends JUnit4CacheTestCase {
 
     @Override
     public int hashCode() {
-      GemFireCacheImpl.getInstance().getLoggerI18n()
+      GemFireCacheImpl.getInstance().getLogger()
           .fine("In TestObject2.hashCode() : " + this._id);
       return this._id;
     }
@@ -444,7 +443,7 @@ public abstract class PDXQueryTestBase extends JUnit4CacheTestCase {
 
     @Override
     public int hashCode() {
-      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.hashCode() : " + this.id);
+      GemFireCacheImpl.getInstance().getLogger().fine("In TestObject.hashCode() : " + this.id);
       return this.id;
     }
 
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 80f2192..a3d5150 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -72,7 +72,6 @@ import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceT
 import org.apache.geode.internal.cache.control.MemoryEvent;
 import org.apache.geode.internal.cache.control.ResourceListener;
 import org.apache.geode.internal.cache.control.TestMemoryThresholdListener;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.DistributedTestUtils;
@@ -1213,10 +1212,11 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa
   private boolean isExceptionDueToLowMemory(QueryException e, int HEAP_USED) {
     String message = e.getMessage();
     return (message.contains(
-        LocalizedStrings.QueryMonitor_LOW_MEMORY_CANCELED_QUERY.toLocalizedString(HEAP_USED))
+        String.format(
+            "Query execution canceled due to memory threshold crossed in system, memory used: %s bytes.",
+            HEAP_USED))
         || message.contains(
-            LocalizedStrings.QueryMonitor_LOW_MEMORY_WHILE_GATHERING_RESULTS_FROM_PARTITION_REGION
-                .toLocalizedString()));
+            "Query execution canceled due to low memory while gathering results from partitioned regions"));
   }
 
   private boolean isExceptionDueToTimeout(QueryException e) {
@@ -1226,7 +1226,8 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa
     return (message.contains("The QueryMonitor thread may be sleeping longer than")
         || message.contains("Query execution cancelled after exceeding max execution time")
         || message.contains(
-            LocalizedStrings.QueryMonitor_LONG_RUNNING_QUERY_CANCELED.toLocalizedString(-1)));
+            String.format("Query execution cancelled after exceeding max execution time %sms.",
+                -1)));
   }
 
   private DefaultQuery.TestHook getPauseHook() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index 586cafa..7a71968 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
 import org.apache.geode.distributed.internal.ReplyException;
 import org.apache.geode.internal.cache.ForceReattemptException;
 import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
@@ -772,8 +771,9 @@ public class PRColocatedEquiJoinDUnitTest extends CacheTestCase {
 
       } catch (UnsupportedOperationException e) {
         if (!e.getMessage().equalsIgnoreCase(
-            LocalizedStrings.DefaultQuery_A_QUERY_ON_A_PARTITIONED_REGION_0_MAY_NOT_REFERENCE_ANY_OTHER_REGION_1
-                .toLocalizedString(name, "/" + coloName))) {
+            String.format(
+                "A query on a Partitioned Region ( %s ) may not reference any other region if query is NOT executed within a Function",
+                name, "/" + coloName))) {
           throw e;
         }
       }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
index 7ad2f05..4621767 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
@@ -131,7 +131,6 @@ import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
 import org.apache.geode.internal.cache.xmlcache.RegionCreation;
 import org.apache.geode.internal.cache.xmlcache.ResourceManagerCreation;
 import org.apache.geode.internal.cache.xmlcache.SerializerCreation;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.IgnoredException;
@@ -329,7 +328,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
       fail("Expected IllegalStateException to be thrown");
     } catch (IllegalStateException e) {
       assertTrue(e.getMessage().contains(
-          LocalizedStrings.DiskStore_IS_USED_IN_NONPERSISTENT_REGION.toLocalizedString()));
+          "Only regions with persistence or overflow to disk can specify DiskStore"));
     }
 
     EvictionAttributes ea =
@@ -350,8 +349,8 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
       fail("Expected IllegalStateException to be thrown");
     } catch (IllegalStateException e) {
       assertTrue(e.getMessage()
-          .contains(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
-              .toLocalizedString("setDiskDirs or setDiskWriteAttributes", getUniqueName())));
+          .contains(String.format("Deprecated API %s cannot be used with DiskStore %s",
+              "setDiskDirs or setDiskWriteAttributes", getUniqueName())));
     }
 
     try {
@@ -362,8 +361,8 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
       fail("Expected IllegalStateException to be thrown");
     } catch (IllegalStateException e) {
       assertTrue(e.getMessage()
-          .contains(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
-              .toLocalizedString("setDiskDirs", getUniqueName())));
+          .contains(String.format("Deprecated API %s cannot be used with DiskStore %s",
+              "setDiskDirs", getUniqueName())));
     }
 
     testXml(cache);
@@ -482,8 +481,8 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
       csc.setOverflowDirectory("overFlow");
     } catch (IllegalStateException e) {
       assertTrue(e.getMessage()
-          .contains(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
-              .toLocalizedString("setOverflowDirectory", getUniqueName())));
+          .contains(String.format("Deprecated API %s cannot be used with DiskStore %s",
+              "setOverflowDirectory", getUniqueName())));
     }
 
     cache.getLogger().config("Eviction disk store : " + csc.getDiskStoreName());
@@ -1473,7 +1472,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
     txMgrCreation.setWriter(new TestTransactionWriter());
     cc.addCacheTransactionManagerCreation(txMgrCreation);
     IgnoredException expectedException = IgnoredException
-        .addIgnoredException(LocalizedStrings.TXManager_NO_WRITER_ON_CLIENT.toLocalizedString());
+        .addIgnoredException("A TransactionWriter cannot be registered on a client");
     try {
       testXml(cc);
       fail("expected exception not thrown");
@@ -1669,8 +1668,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
     rmc.setCriticalHeapPercentage(low);
     cache.setResourceManagerCreation(rmc);
     IgnoredException expectedException = IgnoredException.addIgnoredException(
-        LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE
-            .toLocalizedString());
+        "Eviction percentage must be less than the critical percentage.");
     try {
       testXml(cache);
       assertTrue(false);
@@ -2382,8 +2380,8 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
     attrs.setPoolName("mypool");
     cache.createVMRegion("rootNORMAL", attrs);
     IgnoredException expectedException = IgnoredException.addIgnoredException(
-        LocalizedStrings.AbstractRegion_THE_CONNECTION_POOL_0_HAS_NOT_BEEN_CREATED
-            .toLocalizedString("mypool"));
+        String.format("The connection pool %s has not been created",
+            "mypool"));
     try {
       testXml(cache);
       fail("expected IllegalStateException");
@@ -2403,7 +2401,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
       CacheCreation cache = new CacheCreation();
       cache.createPoolFactory().addLocator(ALIAS2, 12345).create("mypool");
       IgnoredException expectedException = IgnoredException.addIgnoredException(
-          LocalizedStrings.PoolManagerImpl_POOL_NAMED_0_ALREADY_EXISTS.toLocalizedString("mypool"));
+          String.format("A pool named %s already exists", "mypool"));
       try {
         testXml(cache);
         fail("expected IllegalStateException");
@@ -3343,8 +3341,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
     setXmlFile(findFile("unknownNamedAttributes.xml"));
 
     IgnoredException expectedException = IgnoredException.addIgnoredException(
-        LocalizedStrings.RegionAttributesCreation_CANNOT_REFERENCE_NONEXISTING_REGION_ATTRIBUTES_NAMED_0
-            .toLocalizedString());
+        "Cannot reference non-existing region attributes named");
     try {
       getCache();
       fail("Should have thrown an IllegalStateException");
@@ -3876,8 +3873,8 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
     // System.out.println("testNonExistentFile - set: " + System.currentTimeMillis());
 
     IgnoredException expectedException = IgnoredException.addIgnoredException(
-        LocalizedStrings.GemFireCache_DECLARATIVE_CACHE_XML_FILERESOURCE_0_DOES_NOT_EXIST
-            .toLocalizedString(nonExistent.getPath()));
+        String.format("Declarative Cache XML file/resource %s does not exist.",
+            nonExistent.getPath()));
     try {
       getCache();
       fail("Should have thrown a CacheXmlException");
@@ -3901,7 +3898,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
     setXmlFile(dir);
 
     IgnoredException expectedException = IgnoredException.addIgnoredException(
-        LocalizedStrings.GemFireCache_DECLARATIVE_XML_FILE_0_IS_NOT_A_FILE.toLocalizedString(dir));
+        String.format("Declarative XML file %s is not a file.", dir));
     try {
       getCache();
       fail("Should have thrown a CacheXmlException");
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
index 5e6171a..1c56f7f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.cache.xmlcache.CacheCreation;
 import org.apache.geode.internal.cache.xmlcache.CacheXml;
 import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
 import org.apache.geode.internal.cache.xmlcache.ResourceManagerCreation;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.IgnoredException;
 
 
@@ -94,8 +93,9 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
     assertEquals(true, regionBefore.getAttributes().getOffHeap());
 
     IgnoredException.addIgnoredException(
-        LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED
-            .toLocalizedString("/" + regionName));
+        String.format(
+            "The region %s was configured to use off heap memory but no off heap memory was configured",
+            "/" + regionName));
 
     try {
       testXml(cache);
@@ -103,8 +103,9 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
     } catch (IllegalStateException e) {
       // expected
       String msg =
-          LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED
-              .toLocalizedString("/" + regionName);
+          String.format(
+              "The region %s was configured to use off heap memory but no off heap memory was configured",
+              "/" + regionName);
       assertEquals(msg, e.getMessage());
     }
   }
@@ -133,8 +134,9 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
     assertEquals(true, subRegionBefore.getAttributes().getOffHeap());
 
     IgnoredException.addIgnoredException(
-        LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED
-            .toLocalizedString("/" + rootRegionName + "/" + subRegionName));
+        String.format(
+            "The region %s was configured to use off heap memory but no off heap memory was configured",
+            "/" + rootRegionName + "/" + subRegionName));
 
     try {
       testXml(cache);
@@ -142,8 +144,9 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
     } catch (IllegalStateException e) {
       // expected
       final String msg =
-          LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED
-              .toLocalizedString("/" + rootRegionName + "/" + subRegionName);
+          String.format(
+              "The region %s was configured to use off heap memory but no off heap memory was configured",
+              "/" + rootRegionName + "/" + subRegionName);
       assertEquals(msg, e.getMessage());
     }
   }
@@ -191,8 +194,7 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
     rmc.setCriticalOffHeapPercentage(low);
     cache.setResourceManagerCreation(rmc);
     IgnoredException expectedException = IgnoredException.addIgnoredException(
-        LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE
-            .toLocalizedString());
+        "Eviction percentage must be less than the critical percentage.");
     try {
       testXml(cache);
       fail("Expected IllegalArgumentException to be thrown");
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
index 08a7edb..0244cbe 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
@@ -75,7 +75,6 @@ import org.apache.geode.internal.cache.ha.HARegionQueue;
 import org.apache.geode.internal.cache.partitioned.PRTombstoneMessage;
 import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
 import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.Host;
@@ -361,7 +360,7 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
           return mo.tsMessageProcessed >= 1;
         });
         assertTrue("Tombstone GC message is not expected.", mo.thName.contains(
-            LocalizedStrings.DistributionManager_POOLED_MESSAGE_PROCESSOR.toLocalizedString()));
+            "Pooled Message Processor "));
       });
 
     } finally {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
index 5b1b853..97936f1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
@@ -139,7 +139,7 @@ public class LocalRegionDUnitTest extends CacheListenerTestCase {
 
     } catch (CacheLoaderException ex) {
       String expected =
-          org.apache.geode.internal.cache.LoaderHelperImpl.NET_SEARCH_LOCAL.toLocalizedString();
+          org.apache.geode.internal.cache.LoaderHelperImpl.NET_SEARCH_LOCAL;
       String message = ex.getMessage();
       assertTrue("Unexpected message \"" + message + "\"", message.indexOf(expected) != -1);
     }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
index b17409c..aa32c8f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
@@ -29,6 +29,7 @@ import java.util.concurrent.CountDownLatch;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import org.apache.geode.LogWriter;
 import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheTransactionManager;
@@ -44,7 +45,6 @@ import org.apache.geode.cache.Scope;
 import org.apache.geode.cache.SubscriptionAttributes;
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.cache.BucketRegion;
 import org.apache.geode.internal.cache.DistTXState;
@@ -454,7 +454,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
       public Object call() throws Exception {
         CacheTransactionManager mgr = getGemfireCache().getTxManager();
         mgr.setDistributed(true);
-        LogWriterI18n logger = getGemfireCache().getLoggerI18n();
+        LogWriter logger = getGemfireCache().getLogger();
 
         mgr.begin();
         logger.fine("TEST:Commit-1");
@@ -773,7 +773,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         CacheTransactionManager mgr = getGemfireCache().getTxManager();
         mgr.setDistributed(true);
         // mgr.begin();
-        LogWriterI18n logger = getGemfireCache().getLoggerI18n();
+        LogWriter logger = getGemfireCache().getLogger();
 
         Region<CustId, Customer> custPR = getCache().getRegion(CUSTOMER_PR);
         for (int i = 1; i <= 2; i++) {
@@ -1319,10 +1319,10 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custIdOne);
 
         String primaryMember = br.getBucketAdvisor().getPrimary().toString();
-        getGemfireCache().getLoggerI18n().fine("TEST:PRIMARY:" + primaryMember);
+        getGemfireCache().getLogger().fine("TEST:PRIMARY:" + primaryMember);
 
         String memberId = getGemfireCache().getDistributedSystem().getMemberId();
-        getGemfireCache().getLoggerI18n().fine("TEST:MEMBERID:" + memberId);
+        getGemfireCache().getLogger().fine("TEST:MEMBERID:" + memberId);
 
         return null;
       }
@@ -1338,10 +1338,10 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custIdOne);
 
         String primaryMember = br.getBucketAdvisor().getPrimary().toString();
-        getGemfireCache().getLoggerI18n().fine("TEST:PRIMARY:" + primaryMember);
+        getGemfireCache().getLogger().fine("TEST:PRIMARY:" + primaryMember);
 
         String memberId = getGemfireCache().getDistributedSystem().getMemberId();
-        getGemfireCache().getLoggerI18n().fine("TEST:MEMBERID:" + memberId);
+        getGemfireCache().getLogger().fine("TEST:MEMBERID:" + memberId);
 
         return memberId.equals(primaryMember);
       }
@@ -1366,15 +1366,15 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
       @Override
       public void run() {
         try {
-          GemFireCacheImpl.getExisting().getLoggerI18n().fine("TEST:TX WAITING - " + op);
+          GemFireCacheImpl.getExisting().getLogger().fine("TEST:TX WAITING - " + op);
           cdl.await();
-          GemFireCacheImpl.getExisting().getLoggerI18n().fine("TEST:TX END WAITING");
+          GemFireCacheImpl.getExisting().getLogger().fine("TEST:TX END WAITING");
         } catch (InterruptedException e) {
         }
       }
 
       public void release() {
-        GemFireCacheImpl.getExisting().getLoggerI18n().fine("TEST:TX COUNTDOWN - " + op);
+        GemFireCacheImpl.getExisting().getLogger().fine("TEST:TX COUNTDOWN - " + op);
         cdl.countDown();
       }
     }
@@ -1417,15 +1417,15 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
           public void run() {
             CacheTransactionManager mgr = getGemfireCache().getTxManager();
             mgr.setDistributed(true);
-            getGemfireCache().getLoggerI18n().fine("TEST:DISTTX=" + mgr.isDistributed());
+            getGemfireCache().getLogger().fine("TEST:DISTTX=" + mgr.isDistributed());
             mgr.begin();
             Region<CustId, Customer> prRegion = getCache().getRegion(PERSISTENT_CUSTOMER_PR);
 
             CustId custIdOne = new CustId(1);
             Customer customerOne = new Customer("name1_tx", "addr1");
-            getGemfireCache().getLoggerI18n().fine("TEST:TX UPDATE");
+            getGemfireCache().getLogger().fine("TEST:TX UPDATE");
             prRegion.put(custIdOne, customerOne);
-            getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT");
+            getGemfireCache().getLogger().fine("TEST:TX COMMIT");
             mgr.commit();
           }
         }.start();
@@ -1444,7 +1444,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
 
         CustId custIdOne = new CustId(1);
         Customer customerOne = new Customer("name1_nontx", "addr1");
-        getGemfireCache().getLoggerI18n().fine("TEST:TX NONTXUPDATE");
+        getGemfireCache().getLogger().fine("TEST:TX NONTXUPDATE");
         prRegion.put(custIdOne, customerOne);
         return null;
       }
@@ -1490,11 +1490,11 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custId);
         RegionEntry re = br.getRegionEntry(custId);
 
-        getGemfireCache().getLoggerI18n().fine("TEST:TX PRIMARY CUSTOMER=" + customer);
+        getGemfireCache().getLogger().fine("TEST:TX PRIMARY CUSTOMER=" + customer);
 
-        getGemfireCache().getLoggerI18n()
+        getGemfireCache().getLogger()
             .fine("TEST:TX PRIMARY REGION VERSION=" + re.getVersionStamp().getRegionVersion());
-        getGemfireCache().getLoggerI18n()
+        getGemfireCache().getLogger()
             .fine("TEST:TX PRIMARY ENTRY VERSION=" + re.getVersionStamp().getEntryVersion());
         return null;
       }
@@ -1511,11 +1511,11 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custId);
         RegionEntry re = br.getRegionEntry(custId);
 
-        getGemfireCache().getLoggerI18n().fine("TEST:TX SECONDARY CUSTOMER=" + customer);
+        getGemfireCache().getLogger().fine("TEST:TX SECONDARY CUSTOMER=" + customer);
 
-        getGemfireCache().getLoggerI18n()
+        getGemfireCache().getLogger()
             .fine("TEST:TX SECONDARY REGION VERSION=" + re.getVersionStamp().getRegionVersion());
-        getGemfireCache().getLoggerI18n()
+        getGemfireCache().getLogger()
             .fine("TEST:TX SECONDARY ENTRY VERSION=" + re.getVersionStamp().getEntryVersion());
         return null;
       }
@@ -1537,22 +1537,22 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
 
         CacheTransactionManager mgr = getGemfireCache().getTxManager();
         mgr.setDistributed(true);
-        getGemfireCache().getLoggerI18n().fine("TEST:DISTTX=" + mgr.isDistributed());
-        getGemfireCache().getLoggerI18n().fine("TEST:TX BEGIN");
+        getGemfireCache().getLogger().fine("TEST:DISTTX=" + mgr.isDistributed());
+        getGemfireCache().getLogger().fine("TEST:TX BEGIN");
         mgr.begin();
         Region<CustId, Customer> prRegion = getCache().getRegion(PERSISTENT_CUSTOMER_PR);
 
         CustId custIdOne = new CustId(1);
         Customer customerOne = new Customer("name1", "addr1");
-        getGemfireCache().getLoggerI18n().fine("TEST:TX PUT 1");
+        getGemfireCache().getLogger().fine("TEST:TX PUT 1");
         prRegion.put(custIdOne, customerOne);
 
         CustId custIdTwo = new CustId(2);
         Customer customerTwo = new Customer("name2", "addr2");
-        getGemfireCache().getLoggerI18n().fine("TEST:TX PUT 2");
+        getGemfireCache().getLogger().fine("TEST:TX PUT 2");
         prRegion.put(custIdTwo, customerTwo);
 
-        getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT");
+        getGemfireCache().getLogger().fine("TEST:TX COMMIT");
         mgr.commit();
         return null;
       }
@@ -1572,28 +1572,28 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
       public Object call() throws Exception {
         CacheTransactionManager mgr = getGemfireCache().getTxManager();
         mgr.setDistributed(true);
-        getGemfireCache().getLoggerI18n().fine("TEST:DISTTX=" + mgr.isDistributed());
-        getGemfireCache().getLoggerI18n().fine("TEST:TX BEGIN");
+        getGemfireCache().getLogger().fine("TEST:DISTTX=" + mgr.isDistributed());
+        getGemfireCache().getLogger().fine("TEST:TX BEGIN");
         mgr.begin();
 
         Region<CustId, Customer> prRegion = getCache().getRegion(PERSISTENT_CUSTOMER_PR);
 
         CustId custIdOne = new CustId(1);
         Customer customerOne = new Customer("name1", "addr1");
-        getGemfireCache().getLoggerI18n().fine("TEST:TX PUT 1");
+        getGemfireCache().getLogger().fine("TEST:TX PUT 1");
         prRegion.put(custIdOne, customerOne);
 
         BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custIdOne);
 
         assertEquals(0L, br.getVersionVector().getCurrentVersion());
-        getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT 1");
+        getGemfireCache().getLogger().fine("TEST:TX COMMIT 1");
         mgr.commit();
 
         // Verify region version on the region
         assertEquals(1L, br.getVersionVector().getCurrentVersion());
 
         RegionEntry re = br.getRegionEntry(custIdOne);
-        getGemfireCache().getLoggerI18n().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
+        getGemfireCache().getLogger().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
 
         // Verify region version on the region entry
         assertEquals(1L, re.getVersionStamp().getRegionVersion());
@@ -1604,7 +1604,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         mgr.begin();
         prRegion.put(custIdOne, new Customer("name1_1", "addr1"));
 
-        getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT 2");
+        getGemfireCache().getLogger().fine("TEST:TX COMMIT 2");
 
         assertEquals(1L, br.getVersionVector().getCurrentVersion());
         mgr.commit();
@@ -1613,7 +1613,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         assertEquals(2L, br.getVersionVector().getCurrentVersion());
 
         re = br.getRegionEntry(custIdOne);
-        getGemfireCache().getLoggerI18n().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
+        getGemfireCache().getLogger().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
 
         // Verify region version on the region entry
         assertEquals(2L, re.getVersionStamp().getRegionVersion());
@@ -1661,28 +1661,28 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
       public Object call() throws Exception {
         CacheTransactionManager mgr = getGemfireCache().getTxManager();
         mgr.setDistributed(true);
-        getGemfireCache().getLoggerI18n().fine("TEST:DISTTX=" + mgr.isDistributed());
-        getGemfireCache().getLoggerI18n().fine("TEST:TX BEGIN");
+        getGemfireCache().getLogger().fine("TEST:DISTTX=" + mgr.isDistributed());
+        getGemfireCache().getLogger().fine("TEST:TX BEGIN");
         mgr.begin();
 
         Region<CustId, Customer> region = getCache().getRegion(CUSTOMER_RR);
 
         CustId custIdOne = new CustId(1);
         Customer customerOne = new Customer("name1", "addr1");
-        getGemfireCache().getLoggerI18n().fine("TEST:TX PUT 1");
+        getGemfireCache().getLogger().fine("TEST:TX PUT 1");
         region.put(custIdOne, customerOne);
 
         LocalRegion lr = (LocalRegion) region;
 
         assertEquals(0L, lr.getVersionVector().getCurrentVersion());
-        getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT 1");
+        getGemfireCache().getLogger().fine("TEST:TX COMMIT 1");
         mgr.commit();
 
         // Verify region version on the region
         assertEquals(1L, lr.getVersionVector().getCurrentVersion());
 
         RegionEntry re = lr.getRegionEntry(custIdOne);
-        getGemfireCache().getLoggerI18n().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
+        getGemfireCache().getLogger().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
 
         // Verify region version on the region entry
         assertEquals(1L, re.getVersionStamp().getRegionVersion());
@@ -1693,7 +1693,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         mgr.begin();
         region.put(custIdOne, new Customer("name1_1", "addr1"));
 
-        getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT 2");
+        getGemfireCache().getLogger().fine("TEST:TX COMMIT 2");
 
         assertEquals(1L, lr.getVersionVector().getCurrentVersion());
         mgr.commit();
@@ -1702,7 +1702,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
         assertEquals(2L, lr.getVersionVector().getCurrentVersion());
 
         re = lr.getRegionEntry(custIdOne);
-        getGemfireCache().getLoggerI18n().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
+        getGemfireCache().getLogger().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
 
         // Verify region version on the region entry
         assertEquals(2L, re.getVersionStamp().getRegionVersion());
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
index 70016bf..1ef00c8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
@@ -3231,7 +3231,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
     IgnoredException.addIgnoredException("ClassCastException");
     SerializableRunnable suspectStrings = new SerializableRunnable("suspect string") {
       public void run() {
-        InternalDistributedSystem.getLoggerI18n().convertToLogWriter()
+        InternalDistributedSystem.getLogger()
             .info("<ExpectedException action=add>" + "ClassCastException" + "</ExpectedException>"
                 + "<ExpectedException action=add>" + "TransactionDataNodeHasDeparted"
                 + "</ExpectedException>");
@@ -3316,7 +3316,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
     } finally {
       suspectStrings = new SerializableRunnable("suspect string") {
         public void run() {
-          InternalDistributedSystem.getLoggerI18n().convertToLogWriter()
+          InternalDistributedSystem.getLogger()
               .info("<ExpectedException action=remove>" + "ClassCastException"
                   + "</ExpectedException>" + "<ExpectedException action=remove>"
                   + "TransactionDataNodeHasDeparted" + "</ExpectedException>");
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
index 885d394..d86afe1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -429,7 +429,7 @@ public class ConcurrentMapOpsDUnitTest extends JUnit4CacheTestCase {
               assertNull(r.putIfAbsent("clientNullKey", null));
               assertNull(pr.putIfAbsent("clientNullKey", null));
             } catch (AssertionError ex) {
-              r.getCache().getLoggerI18n().fine("SWAP:caught ", ex);
+              r.getCache().getLogger().fine("SWAP:caught ", ex);
               e = ex;
               return false;
             }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
index 3b64344..efea97a 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -418,7 +418,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
         } catch (InvalidDeltaException ide) {
           assertTrue("InvalidDeltaException not expected.",
               delta.getIntVar() == DeltaTestImpl.ERRONEOUS_INT_FOR_TO_DELTA);
-          cache.getLoggerI18n().fine("Received InvalidDeltaException as expected.");
+          cache.getLogger().fine("Received InvalidDeltaException as expected.");
         }
       }
     }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
index 1b6bd02..979e041 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -439,20 +439,20 @@ public class P2PDeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
         @SuppressWarnings("synthetic-access")
         public void afterUpdate(EntryEvent event) {
           numOfUpdates++;
-          cache.getLoggerI18n().fine("afterUpdate(): numOfUpdates = " + numOfUpdates);
-          cache.getLoggerI18n().fine("(key, val): " + event.getKey() + ", " + event.getNewValue());
+          cache.getLogger().fine("afterUpdate(): numOfUpdates = " + numOfUpdates);
+          cache.getLogger().fine("(key, val): " + event.getKey() + ", " + event.getNewValue());
           if (event.getOldValue() != null) {
             if (event.getOldValue() == event.getNewValue()) {
               check = Boolean.TRUE;
             }
           }
           if (((EntryEventImpl) event).getDeltaBytes() != null) {
-            cache.getLoggerI18n().fine("delta bytes received. " + hasDeltaBytes);
+            cache.getLogger().fine("delta bytes received. " + hasDeltaBytes);
             assertTrue("No full value received for event " + event,
                 ((EntryEventImpl) event).getNewValue() != null);
             hasDeltaBytes++;
           } else {
-            cache.getLoggerI18n().fine("delta bytes not received.");
+            cache.getLogger().fine("delta bytes not received.");
           }
         }
       });
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
index 7c2483b..a6791c6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
@@ -304,7 +304,7 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
           Map orders = new HashMap();
           orders.put(orderId2, expectedOrder2);
           orders.put(orderId3, expectedOrder3);
-          getGemfireCache().getLoggerI18n().fine("SWAP:doingPutAll");
+          getGemfireCache().getLogger().fine("SWAP:doingPutAll");
           // orderRegion.putAll(orders);
           refRegion.put(custId, expectedCust);
           Set<OrderId> ordersSet = new HashSet<OrderId>();
@@ -362,7 +362,7 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
     boolean rContainsKC = custRegion.containsKey(custId);
     boolean rContainsKO = containsKey;
     for (OrderId o : ordersSet) {
-      getGemfireCache().getLoggerI18n()
+      getGemfireCache().getLogger()
           .fine("SWAP:rContainsKO:" + rContainsKO + " containsKey:" + orderRegion.containsKey(o));
       rContainsKO = rContainsKO && orderRegion.containsKey(o);
     }
@@ -971,7 +971,7 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
         Region<CustId, Customer> cust = getGemfireCache().getRegion(CUSTOMER);
         Region<CustId, Customer> rr = getGemfireCache().getRegion(D_REFERENCE);
         Customer expectedCust = new Customer("customer" + 1, "address" + 1);
-        getGemfireCache().getLoggerI18n().fine("SWAP:doingPutIfAbsent");
+        getGemfireCache().getLogger().fine("SWAP:doingPutIfAbsent");
         CustId oldCustId = new CustId(1);
         Customer old = cust.putIfAbsent(oldCustId, updateCust);
         assertTrue("expected:" + expectedCust + " but was " + old, expectedCust.equals(old));
@@ -1118,7 +1118,7 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
         mgr.begin();
         CustId conflictCust = new CustId(2);
         Customer customer = new Customer("customer2", "address2");
-        getGemfireCache().getLoggerI18n().fine("SWAP:removeConflict");
+        getGemfireCache().getLogger().fine("SWAP:removeConflict");
         assertTrue(cust.remove(conflictCust, customer));
         TXStateProxy tx = mgr.pauseTransaction();
         cust.put(conflictCust, new Customer("foo", "bar"));
@@ -1199,7 +1199,7 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
         mgr.begin();
         CustId custId3 = new CustId(3);
         CustId custId4 = new CustId(4);
-        getGemfireCache().getLoggerI18n().fine("SWAP:removeConflict");
+        getGemfireCache().getLogger().fine("SWAP:removeConflict");
         cust.removeAll(Arrays.asList(custId3, custId20, custId4));
         TXStateProxy tx = mgr.pauseTransaction();
         // cust.put(custId3, new Customer("foo", "bar"));
@@ -1219,7 +1219,7 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
         // Test a removeall an already missing key.
         // custId2 has already been removed
         mgr.begin();
-        getGemfireCache().getLoggerI18n().fine("SWAP:removeConflict");
+        getGemfireCache().getLogger().fine("SWAP:removeConflict");
         cust.removeAll(Arrays.asList(custId2, custId3));
         tx = mgr.pauseTransaction();
         cust.put(custId2, new Customer("foo", "bar"));
@@ -1395,7 +1395,7 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
         mgr.begin();
         CustId conflictCust = new CustId(2);
         Customer customer = new Customer("customer2", "address2");
-        getGemfireCache().getLoggerI18n().fine("SWAP:removeConflict");
+        getGemfireCache().getLogger().fine("SWAP:removeConflict");
         assertTrue(cust.replace(conflictCust, customer, new Customer("conflict", "conflict")));
         TXStateProxy tx = mgr.pauseTransaction();
         cust.put(conflictCust, new Customer("foo", "bar"));
@@ -3211,7 +3211,7 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
 
       @Override
       public void beforeDestroy(EntryEvent event) throws CacheWriterException {
-        getGemfireCache().getLoggerI18n().fine("SWAP:writer:createEvent:" + event);
+        getGemfireCache().getLogger().fine("SWAP:writer:createEvent:" + event);
         if (!event.isOriginRemote()) {
           throw new CacheWriterException("SUP?? This DESTROY is supposed to be isOriginRemote");
         }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
index ea795d2..dabf13f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
 import org.apache.geode.cache.util.ObjectSizer;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.SerializableCallable;
@@ -901,8 +900,8 @@ public class SizingFlagDUnitTest extends JUnit4CacheTestCase {
     private AtomicInteger invocations = new AtomicInteger();
 
     public int sizeof(Object o) {
-      if (InternalDistributedSystem.getLoggerI18n().fineEnabled()) {
-        InternalDistributedSystem.getLoggerI18n()
+      if (InternalDistributedSystem.getLogger().fineEnabled()) {
+        InternalDistributedSystem.getLogger()
             .fine("TestObjectSizer invoked"/* , new Exception("stack trace") */);
       }
       if (o instanceof TestObject) {
@@ -1043,17 +1042,17 @@ public class SizingFlagDUnitTest extends JUnit4CacheTestCase {
     @Override
     public void afterCreate(EntryEvent event) {
       // Make sure we deserialize the new value
-      event.getRegion().getCache().getLoggerI18n().fine("invoked afterCreate with " + event);
-      event.getRegion().getCache().getLoggerI18n().info(LocalizedStrings.DEBUG,
-          "value is " + event.getNewValue());
+      event.getRegion().getCache().getLogger().fine("invoked afterCreate with " + event);
+      event.getRegion().getCache().getLogger().info(String.format("%s",
+          "value is " + event.getNewValue()));
     }
 
     @Override
     public void afterUpdate(EntryEvent event) {
       // Make sure we deserialize the new value
-      event.getRegion().getCache().getLoggerI18n().fine("invoked afterUpdate with ");
-      event.getRegion().getCache().getLoggerI18n().info(LocalizedStrings.DEBUG,
-          "value is " + event.getNewValue());
+      event.getRegion().getCache().getLogger().fine("invoked afterUpdate with ");
+      event.getRegion().getCache().getLogger().info(String.format("%s",
+          "value is " + event.getNewValue()));
     }
 
   }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index a7d0508..8b0a97f 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -34,6 +34,7 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import org.apache.geode.LogWriter;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.execute.Execution;
 import org.apache.geode.cache.execute.Function;
@@ -50,9 +51,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.LonerDistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.cache.functions.TestFunction;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.compiler.ClassBuilder;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.Host;
@@ -549,8 +548,8 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
       // boolean check = expected.getMessage().equals("Cannot return any result, as
       // Function.hasResult() is false");
       assertTrue(expected.getMessage()
-          .equals(LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE
-              .toLocalizedString("return any")));
+          .equals(String.format("Cannot %s result as the Function#hasResult() is false",
+              "return any")));
     }
   }
 
@@ -584,9 +583,9 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
 
   public static void registerExpectedExceptions(boolean add) {
     final String action = add ? "add" : "remove";
-    LogWriterI18n log = InternalDistributedSystem.getLoggerI18n();
+    LogWriter log = InternalDistributedSystem.getLogger();
     if (log != null) {
-      log.convertToLogWriter().info(
+      log.info(
           "<ExpectedException action=" + action + ">ClassNotFoundException</ExpectedException>");
     }
   }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 0c99a6a..07564ec 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -59,7 +59,6 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.functions.TestFunction;
 import org.apache.geode.internal.cache.tier.sockets.CacheServerTestUtil;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.dunit.LogWriterUtils;
@@ -1106,8 +1105,8 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
       fail("Test failed after the put operation");
     } catch (FunctionException expected) {
       assertTrue(expected.getMessage()
-          .startsWith((LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE
-              .toLocalizedString("return any"))));
+          .startsWith((String.format("Cannot %s result as the Function#hasResult() is false",
+              "return any"))));
     } finally {
       cache.getLogger()
           .info("<ExpectedException action=remove>" + "FunctionException" + "</ExpectedException>");
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index d46a9be..f72e433 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.functions.TestFunction;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.IgnoredException;
@@ -983,8 +982,8 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
       expected.printStackTrace();
       LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage());
       assertTrue(expected.getMessage()
-          .startsWith((LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE
-              .toLocalizedString("return any"))));
+          .startsWith((String.format("Cannot %s result as the Function#hasResult() is false",
+              "return any"))));
     } catch (Exception notexpected) {
       Assert.fail("Test failed during execute or sleeping", notexpected);
     } finally {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index 2a9ec31..2f97888 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.functions.TestFunction;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.IgnoredException;
@@ -968,8 +967,8 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
       expected.printStackTrace();
       LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage());
       assertTrue(expected.getMessage()
-          .startsWith((LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE
-              .toLocalizedString("return any"))));
+          .startsWith((String.format("Cannot %s result as the Function#hasResult() is false",
+              "return any"))));
     } catch (Exception notexpected) {
       Assert.fail("Test failed during execute or sleeping", notexpected);
     } finally {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index a7161b1..5f6251a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.DistributedSystemDisconnectedException;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.functions.TestFunction;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.IgnoredException;
@@ -1003,8 +1002,8 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
       expected.printStackTrace();
       LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage());
       assertTrue(expected.getMessage()
-          .startsWith((LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE
-              .toLocalizedString("return any"))));
+          .startsWith((String.format("Cannot %s result as the Function#hasResult() is false",
+              "return any"))));
     } catch (Exception notexpected) {
       Assert.fail("Test failed during execute or sleeping", notexpected);
     } finally {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
index 17ec593..0280ba6 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
@@ -65,7 +65,6 @@ import org.apache.geode.internal.cache.execute.data.Order;
 import org.apache.geode.internal.cache.execute.data.OrderId;
 import org.apache.geode.internal.cache.execute.data.Shipment;
 import org.apache.geode.internal.cache.execute.data.ShipmentId;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.Host;
@@ -1443,8 +1442,7 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
               fail("Expected different redundancy levels to throw.");
             } catch (IllegalStateException expected) {
               assertEquals(
-                  LocalizedStrings.PartitionAttributesImpl_CURRENT_PARTITIONEDREGIONS_REDUNDANCY_SHOULD_BE_SAME_AS_THE_REDUNDANCY_OF_COLOCATED_PARTITIONEDREGION
-                      .toLocalizedString(),
+                  "Current PartitionedRegion's redundancy should be same as the redundancy of colocated PartitionedRegion",
                   expected.getMessage());
             }
           }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index 7a70615..273df33 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -77,7 +77,6 @@ import org.apache.geode.internal.cache.execute.data.Customer;
 import org.apache.geode.internal.cache.execute.data.Order;
 import org.apache.geode.internal.cache.execute.data.OrderId;
 import org.apache.geode.internal.cache.functions.TestFunction;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.dunit.VM;
@@ -824,8 +823,9 @@ public class PRFunctionExecutionDUnitTest extends CacheTestCase {
       ResultCollector<Void, Void> resultCollector =
           dataSet.withFilter(keySet).setArguments(true).execute(function.getId());
       assertThatThrownBy(() -> resultCollector.getResult()).isInstanceOf(FunctionException.class)
-          .hasMessageStartingWith(LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE
-              .toLocalizedString("return any"));
+          .hasMessageStartingWith(
+              String.format("Cannot %s result as the Function#hasResult() is false",
+                  "return any"));
     });
   }
 
@@ -939,8 +939,9 @@ public class PRFunctionExecutionDUnitTest extends CacheTestCase {
           dataSet.withFilter(keySet).setArguments(true).execute(function.getId());
 
       assertThatThrownBy(() -> resultCollector.getResult()).isInstanceOf(FunctionException.class)
-          .hasMessageStartingWith(LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE
-              .toLocalizedString("return any"));
+          .hasMessageStartingWith(
+              String.format("Cannot %s result as the Function#hasResult() is false",
+                  "return any"));
     });
   }
 
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
index 632ff95..661fd6b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
@@ -122,7 +122,7 @@ public class PartitionResolverDUnitTest extends JUnit4CacheTestCase {
     @Override
     public Serializable getRoutingObject(EntryOperation opDetails) {
       count.incrementAndGet();
-      opDetails.getRegion().getCache().getLoggerI18n().fine(
+      opDetails.getRegion().getCache().getLogger().fine(
           "Resolver called key:" + opDetails.getKey() + " Region " + opDetails.getRegion().getName()
               + " id:" + ((GemFireCacheImpl) opDetails.getRegion().getCache()).getMyId(),
           new Throwable());
@@ -157,7 +157,7 @@ public class PartitionResolverDUnitTest extends JUnit4CacheTestCase {
     verifyResolverCountInVM(accessor, 0);
     verifyResolverCountInVM(datastore1, getNumberOfKeysOwnedByVM(datastore1));
     verifyResolverCountInVM(datastore2, 10);
-    getCache().getLoggerI18n().fine("Reset resolver count");
+    getCache().getLogger().fine("Reset resolver count");
   }
 
   private int getNumberOfKeysOwnedByVM(VM datastore12) {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index 274939f..0ee6b27 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -88,7 +88,6 @@ import org.apache.geode.internal.cache.control.InternalResourceManager;
 import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceObserver;
 import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceObserverAdapter;
 import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.dunit.VM;
@@ -192,15 +191,17 @@ public class PersistentPartitionedRegionDistributedTest implements Serializable
 
     assertThatThrownBy(() -> createPartitionedRegion(0, 0, 2, true))
         .isInstanceOf(IllegalStateException.class).hasMessageContaining(
-            LocalizedStrings.PartitionedRegion_FOR_REGION_0_TotalBucketNum_1_SHOULD_NOT_BE_CHANGED_Previous_Configured_2
-                .toString("/" + partitionedRegionName, 2, 5));
+            String.format(
+                "For partition region %s,total-num-buckets %s should not be changed. Previous configured number is %s.",
+                "/" + partitionedRegionName, 2, 5));
 
     getCache().close();
 
     assertThatThrownBy(() -> createPartitionedRegion(0, 0, 10, true))
         .isInstanceOf(IllegalStateException.class).hasMessageContaining(
-            LocalizedStrings.PartitionedRegion_FOR_REGION_0_TotalBucketNum_1_SHOULD_NOT_BE_CHANGED_Previous_Configured_2
-                .toString("/" + partitionedRegionName, 10, 5));
+            String.format(
+                "For partition region %s,total-num-buckets %s should not be changed. Previous configured number is %s.",
+                "/" + partitionedRegionName, 10, 5));
   }
 
   @Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java
index d5bb1c3..b4e0f5d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java
@@ -21,10 +21,6 @@ import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.apache.geode.cache.FixedPartitionAttributes.createFixedPartition;
 import static org.apache.geode.cache.query.Utils.createPortfoliosAndPositions;
 import static org.apache.geode.management.internal.ManagementConstants.DEFAULT_QUERY_LIMIT;
-import static org.apache.geode.management.internal.ManagementStrings.QUERY__MSG__INVALID_QUERY;
-import static org.apache.geode.management.internal.ManagementStrings.QUERY__MSG__JOIN_OP_EX;
-import static org.apache.geode.management.internal.ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND;
-import static org.apache.geode.management.internal.ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND_ON_MEMBERS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.anything;
 import static org.hamcrest.Matchers.equalTo;
@@ -304,8 +300,9 @@ public class QueryDataDUnitTest implements Serializable {
       String invalidQuery = "SELECT * FROM " + PARTITIONED_REGION_NAME1;
       String invalidQueryResult = distributedSystemMXBean.queryData(invalidQuery, null, 2);
       assertThat(invalidQueryResult,
-          isJson(withJsonPath("$.message", equalTo(QUERY__MSG__INVALID_QUERY
-              .toLocalizedString("Region mentioned in query probably missing /")))));
+          isJson(
+              withJsonPath("$.message", equalTo(String.format("Query is invalid due to error : %s",
+                  "Region mentioned in query probably missing /")))));
 
       String nonexistentRegionName = testName.getMethodName() + "_NONEXISTENT_REGION";
       String regionsNotFoundQuery = "SELECT * FROM /" + nonexistentRegionName
@@ -313,7 +310,8 @@ public class QueryDataDUnitTest implements Serializable {
       String regionsNotFoundResult =
           distributedSystemMXBean.queryData(regionsNotFoundQuery, null, 2);
       assertThat(regionsNotFoundResult, isJson(withJsonPath("$.message",
-          equalTo(QUERY__MSG__REGIONS_NOT_FOUND.toLocalizedString("/" + nonexistentRegionName)))));
+          equalTo(String.format("Cannot find regions %s in any of the members",
+              "/" + nonexistentRegionName)))));
 
       String regionName = testName.getMethodName() + "_REGION";
       String regionsNotFoundOnMembersQuery = "SELECT * FROM /" + regionName;
@@ -325,13 +323,15 @@ public class QueryDataDUnitTest implements Serializable {
       String regionsNotFoundOnMembersResult =
           distributedSystemMXBean.queryData(regionsNotFoundOnMembersQuery, member1.getId(), 2);
       assertThat(regionsNotFoundOnMembersResult, isJson(withJsonPath("$.message",
-          equalTo(QUERY__MSG__REGIONS_NOT_FOUND_ON_MEMBERS.toLocalizedString("/" + regionName)))));
+          equalTo(
+              String.format("Cannot find regions %s in specified members", "/" + regionName)))));
 
       String joinMissingMembersQuery = QUERIES[1];
       String joinMissingMembersResult =
           distributedSystemMXBean.queryData(joinMissingMembersQuery, null, 2);
       assertThat(joinMissingMembersResult,
-          isJson(withJsonPath("$.message", equalTo(QUERY__MSG__JOIN_OP_EX.toLocalizedString()))));
+          isJson(withJsonPath("$.message", equalTo(
+              "Join operation can only be executed on targeted members, please give member input"))));
     });
   }
 
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
index 262b16a..24899d7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -30,7 +30,6 @@ import org.junit.experimental.categories.Category;
 
 import org.apache.geode.GemFireConfigException;
 import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.dunit.rules.ClusterStartupRule;
 import org.apache.geode.test.junit.categories.SecurityTest;
@@ -48,9 +47,12 @@ public class ClusterConfigWithoutSecurityDUnitTest {
   @Before
   public void before() throws Exception {
     IgnoredException
-        .addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toString());
+        .addIgnoredException(
+            "A server cannot specify its own security-manager or security-post-processor when using cluster configuration"
+                .toString());
     IgnoredException
-        .addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION_2.toString());
+        .addIgnoredException(
+            "A server must use cluster configuration when joining a secured cluster.".toString());
     this.lsRule.startLocatorVM(0, new Properties());
   }
 
@@ -94,7 +96,7 @@ public class ClusterConfigWithoutSecurityDUnitTest {
     assertThatThrownBy(
         () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
             .isInstanceOf(GemFireConfigException.class).hasMessage(
-                LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
+                "A server cannot specify its own security-manager or security-post-processor when using cluster configuration");
   }
 
   @Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
index 0e1b8fd..fa3456e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
@@ -33,7 +33,6 @@ import org.junit.experimental.categories.Category;
 
 import org.apache.geode.GemFireConfigException;
 import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.rules.ClusterStartupRule;
 import org.apache.geode.test.junit.categories.SecurityTest;
 import org.apache.geode.test.junit.rules.ServerStarterRule;
@@ -49,8 +48,11 @@ public class SecurityClusterConfigDUnitTest {
 
   @Before
   public void before() throws Exception {
-    addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toString());
-    addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION_2.toString());
+    addIgnoredException(
+        "A server cannot specify its own security-manager or security-post-processor when using cluster configuration"
+            .toString());
+    addIgnoredException(
+        "A server must use cluster configuration when joining a secured cluster.".toString());
 
     Properties props = new Properties();
     props.setProperty(JMX_MANAGER, "false");
@@ -120,7 +122,7 @@ public class SecurityClusterConfigDUnitTest {
     assertThatThrownBy(
         () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
             .isInstanceOf(GemFireConfigException.class).hasMessage(
-                LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
+                "A server cannot specify its own security-manager or security-post-processor when using cluster configuration");
   }
 
   @Test
@@ -138,7 +140,7 @@ public class SecurityClusterConfigDUnitTest {
     assertThatThrownBy(
         () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
             .isInstanceOf(GemFireConfigException.class).hasMessage(
-                LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
+                "A server cannot specify its own security-manager or security-post-processor when using cluster configuration");
   }
 
   @Test
@@ -154,7 +156,7 @@ public class SecurityClusterConfigDUnitTest {
     assertThatThrownBy(
         () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
             .isInstanceOf(GemFireConfigException.class).hasMessage(
-                LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION_2.toLocalizedString());
+                "A server must use cluster configuration when joining a secured cluster.");
   }
 
 }
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
index c365fec..ff31b79 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.dunit.rules.ClusterStartupRule;
 import org.apache.geode.test.dunit.rules.MemberVM;
@@ -51,9 +50,12 @@ public class SecurityWithoutClusterConfigDUnitTest {
   @Before
   public void before() throws Exception {
     IgnoredException
-        .addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toString());
+        .addIgnoredException(
+            "A server cannot specify its own security-manager or security-post-processor when using cluster configuration"
+                .toString());
     IgnoredException
-        .addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION_2.toString());
+        .addIgnoredException(
+            "A server must use cluster configuration when joining a secured cluster.".toString());
     Properties props = new Properties();
     props.setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
     props.setProperty(SECURITY_POST_PROCESSOR, PDXPostProcessor.class.getName());
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
index a6bda30..069e913 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
@@ -97,7 +97,6 @@ import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.TXManagerImpl;
 import org.apache.geode.internal.cache.TXStateProxy;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.util.StopWatch;
 
@@ -3939,8 +3938,9 @@ public class TXJUnitTest {
       } catch (IllegalStateException expected) {
         TransactionId txid = this.txMgr.getTransactionId();
         assertEquals(
-            LocalizedStrings.LocalRegion_NON_TRANSACTIONAL_REGION_COLLECTION_IS_BEING_USED_IN_A_TRANSACTION
-                .toLocalizedString(txid),
+            String.format(
+                "The Region collection is not transactional but is being used in a transaction %s.",
+                txid),
             expected.getMessage());
       }
       assertEquals(1, txKeys.size());
@@ -3950,8 +3950,9 @@ public class TXJUnitTest {
       } catch (IllegalStateException expected) {
         TransactionId txid = this.txMgr.getTransactionId();
         assertEquals(
-            LocalizedStrings.LocalRegion_NON_TRANSACTIONAL_REGION_COLLECTION_IS_BEING_USED_IN_A_TRANSACTION
-                .toLocalizedString(txid),
+            String.format(
+                "The Region collection is not transactional but is being used in a transaction %s.",
+                txid),
             expected.getMessage());
       }
       assertEquals(1, txValues.size());
@@ -4050,8 +4051,9 @@ public class TXJUnitTest {
       } catch (IllegalStateException expected) {
         TransactionId txid = this.txMgr.getTransactionId();
         assertEquals(
-            LocalizedStrings.LocalRegion_NON_TRANSACTIONAL_REGION_COLLECTION_IS_BEING_USED_IN_A_TRANSACTION
-                .toLocalizedString(txid),
+            String.format(
+                "The Region collection is not transactional but is being used in a transaction %s.",
+                txid),
             expected.getMessage());
       }
       assertEquals(1, txEntries.size());
@@ -4098,8 +4100,9 @@ public class TXJUnitTest {
       } catch (IllegalStateException expected) {
         TransactionId txid = this.txMgr.getTransactionId();
         assertEquals(
-            LocalizedStrings.LocalRegion_NON_TRANSACTIONAL_REGION_COLLECTION_IS_BEING_USED_IN_A_TRANSACTION
-                .toLocalizedString(txid),
+            String.format(
+                "The Region collection is not transactional but is being used in a transaction %s.",
+                txid),
             expected.getMessage());
       }
 
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
index ed56333..3d144a7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
@@ -23,7 +23,6 @@ import static org.apache.geode.admin.jmx.internal.AgentLauncher.RUNNING;
 import static org.apache.geode.admin.jmx.internal.AgentLauncher.SHUTDOWN;
 import static org.apache.geode.admin.jmx.internal.AgentLauncher.STARTING;
 import static org.apache.geode.admin.jmx.internal.AgentLauncher.VMARGS;
-import static org.apache.geode.internal.i18n.LocalizedStrings.AgentLauncher_0_IS_NOT_RUNNING_IN_SPECIFIED_WORKING_DIRECTORY_1;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeFalse;
 
@@ -183,8 +182,9 @@ public class DeprecatedAgentLauncherIntegrationTest {
     final Status status = launcher.getStatus();
 
     assertAgentLauncherStatus(status, "Agent", SHUTDOWN, 0);
-    assertThat(status.msg).isEqualTo(AgentLauncher_0_IS_NOT_RUNNING_IN_SPECIFIED_WORKING_DIRECTORY_1
-        .toLocalizedString("Agent", null));
+    assertThat(status.msg)
+        .isEqualTo(String.format("%s is not running in the specified working directory: (%s).",
+            "Agent", null));
     assertThat(status.exception).isNull();
   }
 
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
index 60a56b0..1d188f7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
@@ -46,9 +46,9 @@ import org.apache.geode.test.junit.categories.ClientServerTest;
 public class ConnectionPoolImplJUnitTest {
 
   private static final String expectedRedundantErrorMsg =
-      "Could not find any server to create redundant client queue on.";
+      "Could not find any server to host redundant client queue.";
   private static final String expectedPrimaryErrorMsg =
-      "Could not find any server to create primary client queue on.";
+      "Could not find any server to host primary client queue.";
 
   private Cache cache;
   private int port;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index 1d444cb..59ffecd 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -62,9 +62,9 @@ import org.apache.geode.test.junit.categories.ClientServerTest;
 public class QueueManagerJUnitTest {
 
   private static final String expectedRedundantErrorMsg =
-      "Could not find any server to create redundant client queue on.";
+      "Could not find any server to host redundant client queue.";
   private static final String expectedPrimaryErrorMsg =
-      "Could not find any server to create primary client queue on.";
+      "Could not find any server to host primary client queue.";
 
   private DummyPool pool;
   private LocalLogWriter logger;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
index fd56145..24f568a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.cache.query.CacheUtils;
 import org.apache.geode.cache.query.QueryInvalidException;
 import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
 @Category({OQLQueryTest.class})
@@ -115,7 +114,7 @@ public class CompiledGroupBySelectJUnitTest {
       fail("query creation should have failed");
     } catch (QueryInvalidException qie) {
       assertTrue(qie.toString().indexOf(
-          LocalizedStrings.DefaultQuery_PROJ_COL_ABSENT_IN_GROUP_BY.toLocalizedString()) != -1);
+          "Query contains projected column not present in group by clause") != -1);
     }
 
     queryStr = "select * from /portfolio pf where pf.ID > 0 group by pf.ID";
@@ -124,7 +123,7 @@ public class CompiledGroupBySelectJUnitTest {
       fail("query creation should have failed");
     } catch (QueryInvalidException qie) {
       assertTrue(qie.toString().indexOf(
-          LocalizedStrings.DefaultQuery_PROJ_COL_ABSENT_IN_GROUP_BY.toLocalizedString()) != -1);
+          "Query contains projected column not present in group by clause") != -1);
     }
 
     queryStr = "select * from /portfolio pf, pf.positions pos where pf.ID > 0 group by pf";
@@ -146,7 +145,7 @@ public class CompiledGroupBySelectJUnitTest {
       fail("query creation should have failed");
     } catch (QueryInvalidException qie) {
       assertTrue(qie.toString().indexOf(
-          LocalizedStrings.DefaultQuery_GROUP_BY_COL_ABSENT_IN_PROJ.toLocalizedString()) != -1);
+          "Query contains group by columns not present in projected fields") != -1);
     }
   }
 
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
index 62772b7..8469408 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
@@ -39,7 +39,6 @@ import org.junit.rules.TestName;
 
 import org.apache.geode.distributed.LocatorLauncher.Builder;
 import org.apache.geode.distributed.LocatorLauncher.Command;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Integration tests for using {@link LocatorLauncher} as an in-process API within an existing JVM.
@@ -242,18 +241,20 @@ public class LocatorLauncherIntegrationTest {
   }
 
   private String memberNameValidationErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_MEMBER_NAME_VALIDATION_ERROR_MESSAGE
-        .toLocalizedString("Locator");
+    return String.format(
+        AbstractLauncher.MEMBER_NAME_ERROR_MESSAGE,
+        "Locator", "Locator");
   }
 
   private String workingDirectoryOptionNotValidErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_WORKING_DIRECTORY_OPTION_NOT_VALID_ERROR_MESSAGE
-        .toLocalizedString("Locator");
+    return String.format(
+        AbstractLauncher.WORKING_DIRECTORY_OPTION_NOT_VALID_ERROR_MESSAGE,
+        "Locator", "Locator");
   }
 
   private String workingDirectoryNotFoundErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_WORKING_DIRECTORY_NOT_FOUND_ERROR_MESSAGE
-        .toLocalizedString("Locator");
+    return String.format(AbstractLauncher.WORKING_DIRECTORY_NOT_FOUND_ERROR_MESSAGE,
+        "Locator");
   }
 
   private File getWorkingDirectory() {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherBuilderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherBuilderIntegrationTest.java
index 9631921..c4db526 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherBuilderIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherBuilderIntegrationTest.java
@@ -40,7 +40,6 @@ import org.junit.rules.TestName;
 import org.apache.geode.distributed.ServerLauncher.Builder;
 import org.apache.geode.distributed.ServerLauncher.Command;
 import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Integration tests for using {@link ServerLauncher} as an in-process API within an existing JVM.
@@ -257,18 +256,20 @@ public class ServerLauncherBuilderIntegrationTest {
   }
 
   private String memberNameValidationErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_MEMBER_NAME_VALIDATION_ERROR_MESSAGE
-        .toLocalizedString("Server");
+    return String.format(
+        AbstractLauncher.MEMBER_NAME_ERROR_MESSAGE,
+        "Server", "Server");
   }
 
   private String workingDirectoryOptionNotValidErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_WORKING_DIRECTORY_OPTION_NOT_VALID_ERROR_MESSAGE
-        .toLocalizedString("Server");
+    return String.format(
+        AbstractLauncher.WORKING_DIRECTORY_OPTION_NOT_VALID_ERROR_MESSAGE,
+        "Server", "Server");
   }
 
   private String workingDirectoryNotFoundErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_WORKING_DIRECTORY_NOT_FOUND_ERROR_MESSAGE
-        .toLocalizedString("Server");
+    return String.format(AbstractLauncher.WORKING_DIRECTORY_NOT_FOUND_ERROR_MESSAGE,
+        "Server", "Server");
   }
 
   private File getWorkingDirectory() {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
index 83834bf..c104c26 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
@@ -39,7 +39,6 @@ import org.junit.rules.TestName;
 import org.apache.geode.distributed.ServerLauncher.Builder;
 import org.apache.geode.distributed.ServerLauncher.Command;
 import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Integration tests for using {@link ServerLauncher} as an in-process API within an existing JVM.
@@ -242,18 +241,20 @@ public class ServerLauncherIntegrationTest {
   }
 
   private String memberNameValidationErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_MEMBER_NAME_VALIDATION_ERROR_MESSAGE
-        .toLocalizedString("Server");
+    return String.format(
+        AbstractLauncher.MEMBER_NAME_ERROR_MESSAGE,
+        "Server", "Server");
   }
 
   private String workingDirectoryOptionNotValidErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_WORKING_DIRECTORY_OPTION_NOT_VALID_ERROR_MESSAGE
-        .toLocalizedString("Server");
+    return String.format(
+        AbstractLauncher.WORKING_DIRECTORY_OPTION_NOT_VALID_ERROR_MESSAGE,
+        "Server", "Server");
   }
 
   private String workingDirectoryNotFoundErrorMessage() {
-    return LocalizedStrings.Launcher_Builder_WORKING_DIRECTORY_NOT_FOUND_ERROR_MESSAGE
-        .toLocalizedString("Server");
+    return String.format(AbstractLauncher.WORKING_DIRECTORY_NOT_FOUND_ERROR_MESSAGE,
+        "Server");
   }
 
   private File getWorkingDirectory() {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
index c12f3e6..ef19a68 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -67,7 +67,6 @@ import org.apache.geode.distributed.Locator;
 import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.Config;
 import org.apache.geode.internal.ConfigSource;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.InternalLogWriter;
 import org.apache.geode.test.junit.categories.MembershipTest;
 
@@ -707,8 +706,7 @@ public class InternalDistributedSystemJUnitTest {
     new DistributionConfigImpl(props, false);
     illegalArgumentException.expect(IllegalArgumentException.class);
     illegalArgumentException.expectMessage(
-        LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET
-            .getRawText());
+        "When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases");
   }
 
   @Test(expected = IllegalArgumentException.class)
@@ -720,8 +718,7 @@ public class InternalDistributedSystemJUnitTest {
 
     illegalArgumentException.expect(IllegalArgumentException.class);
     illegalArgumentException.expectMessage(
-        LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET
-            .getRawText());
+        "When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases");
   }
 
   @Test(expected = IllegalArgumentException.class)
@@ -733,8 +730,7 @@ public class InternalDistributedSystemJUnitTest {
 
     illegalArgumentException.expect(IllegalArgumentException.class);
     illegalArgumentException.expectMessage(
-        LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET
-            .getRawText());
+        "When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases");
   }
 
   @Test(expected = IllegalArgumentException.class)
@@ -746,8 +742,7 @@ public class InternalDistributedSystemJUnitTest {
 
     illegalArgumentException.expect(IllegalArgumentException.class);
     illegalArgumentException.expectMessage(
-        LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET
-            .getRawText());
+        "When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases");
   }
 
   private Properties getCommonProperties() {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
index 72e0a8d..8ef8bb3 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.RegionExistsException;
 import org.apache.geode.cache.Scope;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * This is a test for creation of Partition region(PR).
@@ -234,8 +233,8 @@ public class PartitionedRegionCreationJUnitTest {
       pr = (PartitionedRegion) cache.createRegion(regionname, ra);
       fail("testpartionedRegionCreate() Expected IllegalStateException not thrown");
     } catch (RuntimeException expected) {
-      assertTrue(expected.getMessage().contains(LocalizedStrings.CacheCreation_DISKSTORE_NOTFOUND_0
-          .toLocalizedString("nonexistentDiskStore")));
+      assertTrue(expected.getMessage().contains(String.format("Disk store %s not found",
+          "nonexistentDiskStore")));
     }
 
     // Assert that you can't have a diskStoreName unless you are persistent or overflow.
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
index 21d8a34..6c16842 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.cache.control.ResourceManager;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 public class MemoryMonitorJUnitTest {
@@ -77,14 +76,12 @@ public class MemoryMonitorJUnitTest {
     }
   }
 
-  static final String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
-      .getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
+  static final String expectedEx = "Member: .*? above .*? critical threshold";
   public static final String addExpectedAbove =
       "<ExpectedException action=add>" + expectedEx + "</ExpectedException>";
   public static final String removeExpectedAbove =
       "<ExpectedException action=remove>" + expectedEx + "</ExpectedException>";
-  static final String expectedBelow = LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD
-      .getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
+  static final String expectedBelow = "Member: .*? below .*? critical threshold";
   public static final String addExpectedBelow =
       "<ExpectedException action=add>" + expectedBelow + "</ExpectedException>";
   public static final String removeExpectedBelow =
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
index c0f6330..cc490b2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.cache.EvictionAttributesImpl;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 public class MemoryMonitorOffHeapJUnitTest {
@@ -69,14 +68,13 @@ public class MemoryMonitorOffHeapJUnitTest {
     }
   }
 
-  static final String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
-      .getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
+  static final String expectedEx = "Member: .*? above .*? critical threshold";
   public static final String addExpectedAbove =
       "<ExpectedException action=add>" + expectedEx + "</ExpectedException>";
   public static final String removeExpectedAbove =
       "<ExpectedException action=remove>" + expectedEx + "</ExpectedException>";
-  static final String expectedBelow = LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD
-      .getRawText().replaceAll("\\{[0-9]+\\}", ".*?");
+
+  static final String expectedBelow = "Member: .*? below .*? critical threshold";
   public static final String addExpectedBelow =
       "<ExpectedException action=add>" + expectedBelow + "</ExpectedException>";
   public static final String removeExpectedBelow =
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index 26c87c9..714ab63 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -65,9 +65,9 @@ import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 @Category({ClientSubscriptionTest.class})
 public class ConnectionProxyJUnitTest {
   private static final String expectedRedundantErrorMsg =
-      "Could not find any server to create redundant client queue on.";
+      "Could not find any server to host redundant client queue.";
   private static final String expectedPrimaryErrorMsg =
-      "Could not find any server to create primary client queue on.";
+      "Could not find any server to host primary client queue.";
 
   DistributedSystem system;
 
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
index f40ae51..58714e1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
@@ -42,9 +42,9 @@ import org.apache.geode.util.test.TestUtil;
 @Category({ClientSubscriptionTest.class})
 public class RedundancyLevelJUnitTest {
   private static final String expectedRedundantErrorMsg =
-      "Could not find any server to create redundant client queue on.";
+      "Could not find any server to host redundant client queue.";
   private static final String expectedPrimaryErrorMsg =
-      "Could not find any server to create primary client queue on.";
+      "Could not find any server to host primary client queue.";
 
   final String expected =
       "Could not initialize a primary queue on startup. No queue servers available";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
index 7fc34b3..d39b23a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
@@ -21,21 +21,18 @@ import static org.mockito.Mockito.when;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.MockitoAnnotations;
 
 import org.apache.geode.cache.client.internal.Connection;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.i18n.StringId;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.TXManagerImpl;
@@ -46,19 +43,10 @@ import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.tier.ServerSideHandshake;
 import org.apache.geode.internal.security.SecurityService;
 import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.rules.RestoreLocaleRule;
 
 @Category({ClientServerTest.class})
 public class ServerConnectionIntegrationTest {
 
-  /**
-   * This test assumes Locale is in English. Before the test, change the locale of Locale and
-   * StringId to English and restore the original locale after the test.
-   */
-  @Rule
-  public final RestoreLocaleRule restoreLocale =
-      new RestoreLocaleRule(Locale.ENGLISH, l -> StringId.setLocale(l));
-
   private AcceptorImpl acceptor;
   private Socket socket;
   private InternalCache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
deleted file mode 100755
index 0464d0f..0000000
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal.i18n;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Locale;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Test;
-
-import org.apache.geode.i18n.StringId;
-
-/**
- * This class tests all basic i18n functionality.
- */
-public class BasicI18nJUnitTest {
-
-  private static final Locale DEFAULT_LOCALE = Locale.getDefault();
-  // static final Class DEFAULT_RESOURCEBUNDLE = StringIdResourceBundle_ja.class;
-  // static final Class JAPAN_RESOURCEBUNDLE = StringIdResourceBundle_ja.class;
-
-  private static final StringId messageId =
-      (StringId) LocalizedStrings.TESTING_THIS_IS_A_TEST_MESSAGE;
-  private static final String englishMessage = "This is a test message.";
-  private static final String japaneseMessage = "msgID " + messageId.id + ": " + "これはテストメッセージである。";
-
-  private static final Integer messageArg = new Integer(1);
-  private static final StringId messageIdWithArg =
-      (StringId) LocalizedStrings.TESTING_THIS_MESSAGE_HAS_0_MEMBERS;
-  private static final String englishMessageWithArg = "Please ignore: This message has 1 members.";
-  private static final String japaneseMessageWithArg =
-      "msgID " + messageIdWithArg.id + ": Please ignore: このメッセージに 1 メンバーがある。";
-  private static final String englishMessageWithArgMissing =
-      "Please ignore: This message has {0} members.";
-  private static final String japaneseMessageWithArgMissing =
-      "msgID " + messageIdWithArg.id + ": Please ignore: このメッセージに {0} メンバーがある。";
-
-  @After
-  public void tearDown() {
-    // reset to the original
-    StringId.setLocale(DEFAULT_LOCALE);
-  }
-
-  @Test
-  public void testSetLocale() {
-    // Verify we are starting in a known state
-    assertTrue(DEFAULT_LOCALE.equals(getCurrentLocale()));
-    StringId.setLocale(Locale.FRANCE);
-    assertTrue(Locale.FRANCE.equals(getCurrentLocale()));
-
-    StringId.setLocale(Locale.FRANCE);
-    assertTrue(Locale.FRANCE.equals(getCurrentLocale()));
-    StringId s = LocalizedStrings.UNSUPPORTED_AT_THIS_TIME;
-    assertTrue(s.toString().equals(s.toLocalizedString()));
-
-    StringId.setLocale(Locale.JAPAN);
-    assertTrue(Locale.JAPAN.equals(getCurrentLocale()));
-    if (getActiveResourceBundle().usingRawMode()) {
-      assertTrue(s.toString().equals(s.toLocalizedString()));
-    } else {
-      assertFalse(s.toString().equals(s.toLocalizedString()));
-    }
-  }
-
-  /**
-   * Tests {@link StringId#toLocalizedString()} and {@link StringId#toString()} Currently three
-   * languages are tested: English, French, and Japanese. French is tested under the assumption that
-   * it will never be implemented and thus tests an unimplemented language. Each Locale is tested
-   * for these things: 1) toString() no arguments 2) toLocalizedString() no arguments 3)
-   * toString(new Integer(1)) one argument 4) toLocalizedString(new Integer(1)) one argument 5)
-   * toString() wrong number or arguments, too many 6) toLocalizedString() wrong number or
-   * arguments, too many 7) toString() wrong number or arguments, too few 8) toLocalizedString()
-   * wrong number or arguments, too few
-   */
-  @Test
-  public void testToLocalizedString() {
-    Object[] missingArgs = new Object[] {};
-    Object[] extraArgs = new Object[] {messageArg, "should not print"};
-
-    assertEquals(messageId.toString(), englishMessage);
-    assertEquals(messageId.toLocalizedString(), englishMessage);
-    assertEquals(messageIdWithArg.toString(messageArg), englishMessageWithArg);
-    assertEquals(messageIdWithArg.toLocalizedString(messageArg), englishMessageWithArg);
-    assertEquals(messageIdWithArg.toString(extraArgs), englishMessageWithArg);
-    assertEquals(messageIdWithArg.toLocalizedString(extraArgs), englishMessageWithArg);
-    assertEquals(messageIdWithArg.toString(missingArgs), englishMessageWithArgMissing);
-    assertEquals(messageIdWithArg.toLocalizedString(missingArgs), englishMessageWithArgMissing);
-
-    /**
-     * This is assuming that French isn't implemented and will still get the English resource
-     * bundle. The second assert will fail if this isn't the case.
-     **/
-    StringId.setLocale(Locale.FRANCE);
-    assertTrue(Locale.FRANCE.equals(getCurrentLocale()));
-    assertEquals(messageId.toString(), englishMessage);
-    assertEquals(messageId.toLocalizedString(), englishMessage);
-    // Now with a message expecting one argument
-    assertEquals(messageIdWithArg.toString(messageArg), englishMessageWithArg);
-    assertEquals(messageIdWithArg.toLocalizedString(messageArg), englishMessageWithArg);
-    assertEquals(messageIdWithArg.toString(extraArgs), englishMessageWithArg);
-    assertEquals(messageIdWithArg.toLocalizedString(extraArgs), englishMessageWithArg);
-    assertEquals(messageIdWithArg.toString(missingArgs), englishMessageWithArgMissing);
-    assertEquals(messageIdWithArg.toLocalizedString(missingArgs), englishMessageWithArgMissing);
-
-    /**
-     * We no longer bundle the JAPAN localized strings with the product so the following now expects
-     * english msgs.
-     */
-    StringId.setLocale(Locale.JAPAN);
-    assertTrue(Locale.JAPAN.equals(getCurrentLocale()));
-    assertEquals(messageId.toString(), englishMessage);
-    if (getActiveResourceBundle().usingRawMode()) {
-      assertEquals(messageId.toLocalizedString(), englishMessage);
-    } else {
-      assertEquals(messageId.toLocalizedString(), japaneseMessage);
-    }
-    // Now with a message expecting one argument
-    assertEquals(messageIdWithArg.toString(messageArg), englishMessageWithArg);
-    if (getActiveResourceBundle().usingRawMode()) {
-      assertEquals(messageIdWithArg.toLocalizedString(messageArg), englishMessageWithArg);
-    } else {
-      assertEquals(messageIdWithArg.toLocalizedString(messageArg), japaneseMessageWithArg);
-    }
-    assertEquals(messageIdWithArg.toString(extraArgs), englishMessageWithArg);
-    if (getActiveResourceBundle().usingRawMode()) {
-      assertEquals(messageIdWithArg.toLocalizedString(extraArgs), englishMessageWithArg);
-    } else {
-      assertEquals(messageIdWithArg.toLocalizedString(extraArgs), japaneseMessageWithArg);
-    }
-    assertEquals(messageIdWithArg.toString(missingArgs), englishMessageWithArgMissing);
-    if (getActiveResourceBundle().usingRawMode()) {
-      assertEquals(messageIdWithArg.toLocalizedString(missingArgs), englishMessageWithArgMissing);
-    } else {
-      assertEquals(messageIdWithArg.toLocalizedString(missingArgs), japaneseMessageWithArgMissing);
-    }
-  }
-
-  @Test
-  public void testEnglishLanguage() {
-    StringId.setLocale(Locale.ENGLISH);
-    assertEquals(messageId.toLocalizedString(), englishMessage);
-  }
-
-  @Test
-  public void testJapaneseLanguage() {
-    StringId.setLocale(Locale.JAPANESE);
-    if (getActiveResourceBundle().usingRawMode()) {
-      assertEquals(messageId.toLocalizedString(), englishMessage);
-    } else {
-      assertEquals(messageId.toLocalizedString(), japaneseMessage);
-    }
-  }
-
-  @Test
-  public void testAlternateEnglishCountries() {
-    StringId.setLocale(Locale.CANADA);
-    assertEquals(messageId.toLocalizedString(), englishMessage);
-
-    StringId.setLocale(Locale.UK);
-    assertEquals(messageId.toLocalizedString(), englishMessage);
-  }
-
-  /**
-   * Use reflection to find all instances of StringId defined within the classes listed in
-   * StringIdDefiningClasses and verify there are not any duplicate indexes used.
-   */
-  @Test
-  public void testVerifyStringIdsAreUnique() {
-    final Set<Integer> allStringIds = new HashSet<Integer>(3000);
-
-    // Save all duplicate ids and report them at the end
-    final Set<StringId> duplicates = new HashSet<StringId>();
-
-    for (StringId instance : getAllStringIds()) {
-      boolean isUnique = allStringIds.add(((StringId) instance).id);
-      // Duplicate ids between 0-1023 are allowed since they are duplicated
-      // between String bundles to minimize compiler dependencies.
-      if ((!isUnique) && ((StringId) instance).id >= 1024) {
-        boolean status = duplicates.add(instance);
-        assertTrue("Failed to add " + instance + "to the list of"
-            + " duplicates because of duplicate duplicates", status);
-      }
-    }
-    if (!duplicates.isEmpty()) {
-      StringBuilder err = new StringBuilder();
-      err.append("The following duplicate StringIds were found:");
-      for (StringId i : duplicates) {
-        err.append("\n").append(((StringId) i).id).append(" : ").append(i.getRawText());
-      }
-      fail(err.toString() + "\nSearched in " + getStringIdDefiningClasses());
-    }
-  }
-
-  /**
-   * Verify the "Formated" form of the string matches the raw text form. This test is to catch
-   * issues like bug #40146 This tests the English version in the US locale.
-   */
-  @Test
-  public void testVerifyStringsAreProperlyEscaped_US() {
-    verifyStringsAreProperlyEscaped(Locale.US);
-  }
-
-  /**
-   * Verify the "Formated" form of the string matches the raw text form. This test is to catch
-   * issues like bug #40146 This tests the English version in the UK locale.
-   */
-  @Test
-  public void testVerifyStringsAreProperlyEscaped_UK() {
-    verifyStringsAreProperlyEscaped(Locale.UK);
-  }
-
-  /**
-   * Verify the "Formated" form of the string matches the raw text form. This test is to catch
-   * issues like bug #40146 This tests the English version in the JAPAN locale.
-   */
-  @Test
-  public void testVerifyStringsAreProperlyEscaped_JAPAN() {
-    verifyStringsAreProperlyEscaped(Locale.JAPAN);
-  }
-
-  /**
-   * Get all of the StringId instances via reflection.
-   *
-   * @return a set of all StringId declarations within the product
-   */
-  private Set<StringId> getAllStringIds() {
-    final Set<StringId> allStringIds = new HashSet<StringId>();
-    for (String className : getStringIdDefiningClasses()) {
-      try {
-        Class<?> c = Class.forName(className);
-        Field[] fields = c.getDeclaredFields();
-        final String msg = "Found no StringIds in " + className;
-        assertTrue(msg, fields.length > 0);
-        for (Field f : fields) {
-          f.setAccessible(true);
-          StringId instance = (StringId) f.get(null);
-          allStringIds.add(instance);
-        }
-      } catch (ClassNotFoundException cnfe) {
-        throw new AssertionError(cnfe.toString(), cnfe);
-      } catch (Exception e) {
-        String exMsg =
-            "Reflection attempt failed while attempting to find all" + " StringId instances. ";
-        throw new AssertionError(exMsg + e.toString(), e);
-      }
-    }
-    return allStringIds;
-  }
-
-  /**
-   * Lists all of the classes that define StringId instances
-   *
-   * @return a set of all classes that contain StringId declarations
-   */
-  private Set<String> getStringIdDefiningClasses() {
-    final Set<String> StringIdDefiningClasses = new LinkedHashSet<String>();
-    final String pkg = "org.apache.geode.internal.i18n.";
-    // StringIdDefiningClasses.add(pkg + "ParentLocalizedStrings");
-    StringIdDefiningClasses.add(pkg + "LocalizedStrings");
-    StringIdDefiningClasses.add("org.apache.geode.management.internal.ManagementStrings");
-    return StringIdDefiningClasses;
-  }
-
-  /**
-   * Helper to access a private method via reflection, thus allowing us to not expose them to
-   * customers.
-   */
-  private Locale getCurrentLocale() {
-    Class<?> c = StringId.class;
-    Locale locale = null;
-    try {
-      Method m = c.getDeclaredMethod("getCurrentLocale");
-      m.setAccessible(true);
-      locale = (Locale) m.invoke(null);
-    } catch (Exception e) {
-      String msg = "Reflection attempt failed for StringId.getCurrentLocale ";
-      throw new AssertionError(msg + e.toString(), e);
-    }
-    return locale;
-  }
-
-  /**
-   * Helper to access a private method via reflection, thus allowing us to not expose them to
-   * customers.
-   */
-  private AbstractStringIdResourceBundle getActiveResourceBundle() {
-    Class<?> c = StringId.class;
-    AbstractStringIdResourceBundle rb = null;
-    try {
-      Method m = c.getDeclaredMethod("getActiveResourceBundle");
-      m.setAccessible(true);
-      rb = (AbstractStringIdResourceBundle) m.invoke(null);
-    } catch (Exception e) {
-      String msg = "Reflection attempt failed for StringId.getActiveResourceBundle ";
-      throw new AssertionError(msg + e.toString(), e);
-    }
-    return rb;
-  }
-
-  /**
-   * Check that the "raw" string matches the "formatted" string after taking into account known
-   * changes due to the fomatting process. For example: <code>
-   * "I''m using a contraction." should become "I'm using a contraction."
-   * </code>
-   */
-  private void verifyStringsAreProperlyEscaped(Locale loc) {
-    StringId.setLocale(loc);
-
-    final Set<StringId> misquoted = new HashSet<StringId>();
-
-    final Object[] identityArgs = new Object[100];
-
-    for (int index = 0; index < identityArgs.length; index++) {
-      identityArgs[index] = index;
-    }
-
-    final AbstractStringIdResourceBundle rb = getActiveResourceBundle();
-    for (StringId instance : getAllStringIds()) {
-      String raw = rb.getString(instance);
-      String altered = raw.replaceAll("''", "'");
-      altered = altered.replaceAll("\\{([0-9]+)[^\\}]*\\}", "$1");
-      if (!rb.usingRawMode()) {
-        altered = "msgID " + ((StringId) instance).id + ": " + altered;
-      }
-      String formatted = null;
-      try {
-        formatted = instance.toLocalizedString(identityArgs);
-      } catch (IllegalArgumentException iae) {
-        String testName = this.getClass().getName().replaceAll("\\.", "/") + ".class";
-        String exMsg = "Improper message id=" + ((StringId) instance).id + "\n"
-            + "Usually this is caused by an unmatched or nested \"{\"\n"
-            + "Examples:\t\"{0]\" or \"{ {0} }\"\n"
-            + "This is just the first failure, it is in your interest"
-            + " to rebuild and run just this one test.\n"
-            + "build.sh run-java-tests -Djunit.testcase=" + testName;
-        throw new AssertionError(exMsg, iae);
-      }
-      if (!altered.equals(formatted)) {
-        System.err.println("altered:   " + altered);
-        System.err.println("formatted: " + formatted);
-        misquoted.add(instance);
-      }
-    }
-    if (!misquoted.isEmpty()) {
-      StringBuffer err = new StringBuffer();
-      err.append("These errors are usually resolved by replacing ");
-      err.append("\"'\" with \"''\".\n");
-      err.append("If the error is in the non-english version then ");
-      err.append("alter the text in StringIdResouceBundle_{lang}.txt.\n");
-      err.append("The following misquoted StringIds were found:");
-      for (StringId i : misquoted) {
-        err.append("\n").append("StringId id=").append(((StringId) i).id).append(" : text=\"")
-            .append(i.getRawText()).append("\"");
-      }
-      fail(err.toString());
-    }
-  }
-}
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 6bcbae3..be6dc90 100644
--- a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -47,7 +47,6 @@ org/apache/geode/internal/hll/HyperLogLogPlus$Format
 org/apache/geode/internal/hll/HyperLogLogPlus$HyperLogLogPlusMergeException
 org/apache/geode/internal/hll/HyperLogLogPlus$SerializationHolder
 org/apache/geode/internal/logging/log4j/FastLogger
-org/apache/geode/internal/logging/log4j/LocalizedMessage
 org/apache/geode/internal/logging/log4j/LogWriterAppenders$Identifier
 org/apache/geode/internal/logging/log4j/LogWriterLogger
 org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessage
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index f5b8733..bbfecb6 100644
--- a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -187,7 +187,7 @@ fromData,27
 toData,24
 
 org/apache/geode/distributed/internal/StartupMessage,2
-fromData,293
+fromData,291
 toData,318
 
 org/apache/geode/distributed/internal/StartupResponseMessage,2
@@ -391,7 +391,7 @@ fromData,14
 toData,14
 
 org/apache/geode/internal/InternalInstantiator$RegistrationMessage,2
-fromData,125
+fromData,123
 toData,46
 
 org/apache/geode/internal/ManagerInfo,2
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
index 0fb1e6f..5aab51e 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.TransactionId;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.TXManagerImpl;
 import org.apache.geode.internal.cache.TXStateProxy;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 public class JCALocalTransaction implements LocalTransaction {
   private volatile InternalCache cache;
@@ -127,8 +126,7 @@ public class JCALocalTransaction implements LocalTransaction {
     } catch (IllegalStateException ise) {
       // It is possible that the GFE transaction has already been rolled back.
       if (ise.getMessage()
-          .equals(LocalizedStrings.TXManagerImpl_THREAD_DOES_NOT_HAVE_AN_ACTIVE_TRANSACTION
-              .toLocalizedString())) {
+          .equals("Thread does not have an active transaction")) {
         // ignore
       } else {
         throw new ResourceException(ise);
diff --git a/geode-core/src/main/java/org/apache/geode/CopyHelper.java b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
index 5c953cc..635402c 100644
--- a/geode-core/src/main/java/org/apache/geode/CopyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
@@ -28,7 +28,6 @@ import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.CachedDeserializable;
 import org.apache.geode.internal.cache.Token;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.WritablePdxInstance;
 import org.apache.geode.pdx.internal.PdxUnreadData;
@@ -184,7 +183,7 @@ public final class CopyHelper {
             if (cause instanceof CloneNotSupportedException) {
               // try using Serialization
             } else {
-              throw new CopyException(LocalizedStrings.CopyHelper_CLONE_FAILED.toLocalizedString(),
+              throw new CopyException("Clone failed.",
                   cause != null ? cause : ex);
             }
           }
@@ -275,11 +274,11 @@ public final class CopyHelper {
       return (T) DataSerializer.readObject(new DataInputStream(hdos.getInputStream()));
     } catch (ClassNotFoundException ex) {
       throw new CopyException(
-          LocalizedStrings.CopyHelper_COPY_FAILED_ON_INSTANCE_OF_0.toLocalizedString(o.getClass()),
+          String.format("Copy failed on instance of  %s", o.getClass()),
           ex);
     } catch (IOException ex) {
       throw new CopyException(
-          LocalizedStrings.CopyHelper_COPY_FAILED_ON_INSTANCE_OF_0.toLocalizedString(o.getClass()),
+          String.format("Copy failed on instance of  %s", o.getClass()),
           ex);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
index 430e2f9..215da08 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -61,7 +61,6 @@ import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.StoredObject;
@@ -315,8 +314,9 @@ public abstract class DataSerializer {
           .getRegion(fullPath);
       if (rgn == null) {
         throw new RegionNotFoundException(
-            LocalizedStrings.DataSerializer_REGION_0_COULD_NOT_BE_FOUND_WHILE_READING_A_DATASERIALIZER_STREAM
-                .toLocalizedString(fullPath));
+            String.format(
+                "Region ' %s ' could not be found while reading a DataSerializer stream",
+                fullPath));
       }
     }
     return rgn;
@@ -475,7 +475,7 @@ public abstract class DataSerializer {
       return addr;
     } catch (UnknownHostException ex) {
       IOException ex2 = new IOException(
-          LocalizedStrings.DataSerializer_WHILE_READING_AN_INETADDRESS.toLocalizedString());
+          "While reading an InetAddress");
       ex2.initCause(ex);
       throw ex2;
     }
@@ -1321,7 +1321,7 @@ public abstract class DataSerializer {
           DataSerializer.writeObject(object, hdos);
         } catch (IOException e) {
           RuntimeException e2 = new IllegalArgumentException(
-              LocalizedStrings.DataSerializer_PROBELM_WHILE_SERIALIZING.toLocalizedString());
+              "Probelm while serializing.");
           e2.initCause(e);
           throw e2;
         }
@@ -3185,7 +3185,7 @@ public abstract class DataSerializer {
 
     if (e == null) {
       throw new NullPointerException(
-          LocalizedStrings.DataSerializer_ENUM_TO_SERIALIZE_IS_NULL.toLocalizedString());
+          "The enum constant to serialize is null");
     }
 
     if (logger.isTraceEnabled(LogMarker.SERIALIZER_VERBOSE)) {
@@ -3214,10 +3214,10 @@ public abstract class DataSerializer {
 
     if (clazz == null) {
       throw new NullPointerException(
-          LocalizedStrings.DataSerializer_ENUM_CLASS_TO_DESERIALIZE_IS_NULL.toLocalizedString());
+          "the enum class to deserialize is null");
     } else if (!clazz.isEnum()) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DataSerializer_CLASS_0_NOT_ENUM.toLocalizedString(clazz.getName()));
+          String.format("Class %s is not an enum", clazz.getName()));
     }
 
     int ordinal = InternalDataSerializer.readArrayLength(in);
diff --git a/geode-core/src/main/java/org/apache/geode/Instantiator.java b/geode-core/src/main/java/org/apache/geode/Instantiator.java
index ea42057..07763a6 100644
--- a/geode-core/src/main/java/org/apache/geode/Instantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/Instantiator.java
@@ -17,7 +17,6 @@ package org.apache.geode;
 import org.apache.geode.internal.InternalInstantiator;
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * {@code Instantiator} allows classes that implement {@link DataSerializable} to be registered with
@@ -191,18 +190,18 @@ public abstract class Instantiator {
   public Instantiator(Class<? extends DataSerializable> c, int classId) {
     if (c == null) {
       throw new NullPointerException(
-          LocalizedStrings.Instantiator_CANNOT_REGISTER_A_NULL_CLASS.toLocalizedString());
+          "Cannot register a null class.");
     }
 
     if (!DataSerializable.class.isAssignableFrom(c)) {
       throw new IllegalArgumentException(
-          LocalizedStrings.Instantiator_CLASS_0_DOES_NOT_IMPLEMENT_DATASERIALIZABLE
-              .toLocalizedString(c.getName()));
+          String.format("Class  %s  does not implement DataSerializable",
+              c.getName()));
     }
 
     if (classId == 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.Instantiator_CLASS_ID_0_MUST_NOT_BE_0.toLocalizedString(classId));
+          String.format("Class id  %s  must not be 0.", classId));
     }
 
     this.clazz = c;
diff --git a/geode-core/src/main/java/org/apache/geode/SystemFailure.java b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
index 91d045f..918d617 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemFailure.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
@@ -19,7 +19,6 @@ import org.apache.geode.internal.ExitCode;
 import org.apache.geode.internal.SystemFailureTestHook;
 import org.apache.geode.internal.admin.remote.RemoteGfManagerAgent;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LoggingThread;
 
 /**
@@ -151,19 +150,17 @@ public final class SystemFailure {
    */
   static int SHUTDOWN_WAIT = 1000;
   /**
-   * Preallocated error messages\ LocalizedStrings may use memory (in the form of an iterator) so we
+   * Preallocated error messages may use memory (in the form of an iterator) so we
    * must get the translated messages in advance.
    **/
   static final String JVM_CORRUPTION =
-      LocalizedStrings.SystemFailure_JVM_CORRUPTION_HAS_BEEN_DETECTED.toLocalizedString();
+      "JVM corruption has been detected";
   static final String CALLING_SYSTEM_EXIT =
-      LocalizedStrings.SystemFailure_SINCE_THIS_IS_A_DEDICATED_CACHE_SERVER_AND_THE_JVM_HAS_BEEN_CORRUPTED_THIS_PROCESS_WILL_NOW_TERMINATE_PERMISSION_TO_CALL_SYSTEM_EXIT_INT_WAS_GIVEN_IN_THE_FOLLOWING_CONTEXT
-          .toLocalizedString();
+      "Since this is a dedicated cache server and the JVM has been corrupted, this process will now terminate. Permission to call System#exit(int) was given in the following context.";
   public static final String DISTRIBUTION_HALTED_MESSAGE =
-      LocalizedStrings.SystemFailure_DISTRIBUTION_HALTED_DUE_TO_JVM_CORRUPTION.toLocalizedString();
+      "Distribution halted due to JVM corruption";
   public static final String DISTRIBUTED_SYSTEM_DISCONNECTED_MESSAGE =
-      LocalizedStrings.SystemFailure_DISTRIBUTED_SYSTEM_DISCONNECTED_DUE_TO_JVM_CORRUPTION
-          .toLocalizedString();
+      "Distributed system disconnected due to JVM corruption";
 
   /**
    * the underlying failure
@@ -578,8 +575,9 @@ public final class SystemFailure {
 
     // Allocate this error in advance, since it's too late once it's been detected!
     final OutOfMemoryError oome = new OutOfMemoryError(
-        LocalizedStrings.SystemFailure_0_MEMORY_HAS_REMAINED_CHRONICALLY_BELOW_1_BYTES_OUT_OF_A_MAXIMUM_OF_2_FOR_3_SEC
-            .toLocalizedString(new Object[] {PROCTOR_NAME, Long.valueOf(minimumMemoryThreshold),
+        String.format(
+            "%s : memory has remained chronically below  %s  bytes (out of a maximum of  %s ) for  %s  sec.",
+            new Object[] {PROCTOR_NAME, Long.valueOf(minimumMemoryThreshold),
                 Long.valueOf(maxMemory), Integer.valueOf(WATCHDOG_WAIT)}));
 
     logFine(PROCTOR_NAME,
@@ -848,8 +846,7 @@ public final class SystemFailure {
   public static void setFailure(Error failure) {
     if (failure == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.SystemFailure_YOU_ARE_NOT_PERMITTED_TO_UNSET_A_SYSTEM_FAILURE
-              .toLocalizedString());
+          "You are not permitted to un-set a system failure.");
     }
     if (SystemFailureTestHook.errorIsExpected(failure)) {
       return;
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
index 2f01787..f3d1579 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
@@ -23,7 +23,6 @@ import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Date;
 
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 
 /**
@@ -93,10 +92,9 @@ public class AdminConfig {
       // Header
       ps.print("#");
       ps.println(
-          LocalizedStrings.AdminConfig_THIS_FILE_IS_GENERATED_BY_ADMINCONSOLE_EDIT_AS_YOU_WISH_BUT_IT_WILL_BE_OVERWRITTEN_IF_IT_IS_MODIFIED_IN_ADMINCONSOLE
-              .toLocalizedString());
+          "This file is generated by AdminConsole. Edit as you wish but it will be overwritten if it is modified in AdminConsole.");
       ps.println("#");
-      ps.println(LocalizedStrings.AdminConfig_MODIFIED_0.toLocalizedString(new Date()));
+      ps.println(String.format("Modified %s", new Date()));
       ps.println("#");
       ps.println("# Name, Type, Host, Port");
       ps.println("#");
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
index 3a7c29d..7cfe0c9 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
@@ -16,14 +16,13 @@ package org.apache.geode.admin;
 
 import java.util.Properties;
 
+import org.apache.geode.LogWriter;
 import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
 import org.apache.geode.admin.internal.DistributedSystemConfigImpl;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionConfigImpl;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LocalLogWriter;
 
 /**
@@ -54,8 +53,7 @@ public class AdminDistributedSystemFactory {
   @Deprecated
   public static void bindToAddress(String bindAddress) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.AdminDistributedSystemFactory_PLEASE_USE_DISTRIBUTEDSYSTEMCONFIGSETBINDADDRESS_INSTEAD
-            .toLocalizedString());
+        "Please use DistributedSystemConfig.setBindAddress instead.");
   }
 
   /**
@@ -140,7 +138,7 @@ public class AdminDistributedSystemFactory {
    *
    * @return a GemFire LogWriterI18n for logging
    */
-  public static LogWriterI18n getLogWriter() {
+  public static LogWriter getLogWriter() {
     return new LocalLogWriter(DistributionConfig.DEFAULT_LOG_LEVEL);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/Alert.java b/geode-core/src/main/java/org/apache/geode/admin/Alert.java
index ba20335..a130f44 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/Alert.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/Alert.java
@@ -16,7 +16,7 @@ package org.apache.geode.admin;
 
 /**
  * An administration alert that is issued by a member of a GemFire distributed system. It is similar
- * to a {@linkplain org.apache.geode.i18n.LogWriterI18n log message}.
+ * to a {@linkplain org.apache.geode.LogWriter log message}.
  *
  * @see AlertListener
  * @since GemFire 3.5
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java b/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
index 2fdcef8..2ea93a5 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
@@ -15,7 +15,6 @@
 package org.apache.geode.admin;
 
 import org.apache.geode.internal.admin.Alert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Type-safe enumeration for {@link org.apache.geode.admin.Alert Alert} level.
@@ -80,8 +79,8 @@ public class AlertLevel implements java.io.Serializable {
       case Alert.OFF:
         return AlertLevel.OFF;
       default:
-        throw new IllegalArgumentException(LocalizedStrings.AlertLevel_UNKNOWN_ALERT_SEVERITY_0
-            .toLocalizedString(Integer.valueOf(severity)));
+        throw new IllegalArgumentException(String.format("Unknown alert severity:  %s",
+            Integer.valueOf(severity)));
     }
   }
 
@@ -99,7 +98,7 @@ public class AlertLevel implements java.io.Serializable {
     }
 
     throw new IllegalArgumentException(
-        LocalizedStrings.AlertLevel_THERE_IS_NO_ALERT_LEVEL_0.toLocalizedString(name));
+        String.format("There is no alert level %s", name));
   }
 
   public int getSeverity() {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
index 246fcaf..7e049cd 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
@@ -478,14 +478,14 @@ public interface DistributedSystemConfig extends Cloneable {
   /**
    * Returns the name of the log file to which informational messages are written.
    *
-   * @see org.apache.geode.i18n.LogWriterI18n
+   * @see org.apache.geode.LogWriter
    */
   String getLogFile();
 
   /**
    * Sets the name of the log file to which informational messages are written.
    *
-   * @see org.apache.geode.i18n.LogWriterI18n
+   * @see org.apache.geode.LogWriter
    */
   void setLogFile(String logFile);
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
index 4883135..c68c031 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
@@ -15,7 +15,6 @@
 package org.apache.geode.admin;
 
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Provides information about the aggregate health of the members of a GemFire distributed system
@@ -156,13 +155,13 @@ public interface GemFireHealth {
   class Health implements java.io.Serializable {
     private static final long serialVersionUID = 3039539430412151801L;
     /** The string for good health */
-    static final String GOOD_STRING = LocalizedStrings.GemFireHealth_GOOD.toLocalizedString();
+    static final String GOOD_STRING = "Good";
 
     /** The string for okay health */
-    static final String OKAY_STRING = LocalizedStrings.GemFireHealth_OKAY.toLocalizedString();
+    static final String OKAY_STRING = "Okay";
 
     /** The string for poor health */
-    static final String POOR_STRING = LocalizedStrings.GemFireHealth_POOR.toLocalizedString();
+    static final String POOR_STRING = "Poor";
 
     //////////////////// Instance Fields ////////////////////
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
index fb31076..2824e73 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
@@ -23,8 +23,8 @@ import java.util.Set;
 
 import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
+import org.apache.geode.LogWriter;
 import org.apache.geode.cache.Region;
-import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.cache.PartitionedRegion;
 
 /**
@@ -54,7 +54,7 @@ public class RegionSubRegionSnapshot implements DataSerializable {
     } else {
       this.entryCount = reg.entrySet().size();
     }
-    final LogWriterI18n logger = reg.getCache().getLoggerI18n();
+    final LogWriter logger = reg.getCache().getLogger();
     if ((logger != null) && logger.fineEnabled()) {
       logger.fine("RegionSubRegionSnapshot Region entry count =" + this.entryCount + " for region ="
           + this.name);
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
index ef5b1b1..4fc3446 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
@@ -21,9 +21,7 @@ import org.apache.logging.log4j.Logger;
 import org.apache.geode.admin.GemFireHealth;
 import org.apache.geode.admin.GemFireHealthConfig;
 import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * The abstract superclass of all GemFire health evaluators. Basically, this class specifies what
@@ -94,8 +92,8 @@ public abstract class AbstractHealthEvaluator {
    * {@linkplain GemFireHealth#OKAY_HEALTH okay} status.
    */
   protected HealthStatus okayHealth(String diagnosis) {
-    logger.info(LocalizedMessage.create(LocalizedStrings.AbstractHealthEvaluator_OKAY_HEALTH__0,
-        diagnosis));
+    logger.info("OKAY_HEALTH:  {}",
+        diagnosis);
     return new HealthStatus(GemFireHealth.OKAY_HEALTH, diagnosis);
   }
 
@@ -104,8 +102,8 @@ public abstract class AbstractHealthEvaluator {
    * {@linkplain GemFireHealth#POOR_HEALTH poor} status.
    */
   protected HealthStatus poorHealth(String diagnosis) {
-    logger.info(LocalizedMessage.create(LocalizedStrings.AbstractHealthEvaluator_POOR_HEALTH__0,
-        diagnosis));
+    logger.info("POOR_HEALTH:  {}",
+        diagnosis);
     return new HealthStatus(GemFireHealth.POOR_HEALTH, diagnosis);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index ec2d0a8..f622ab5 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -90,11 +90,9 @@ import org.apache.geode.internal.admin.remote.RevokePersistentIDRequest;
 import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
 import org.apache.geode.internal.cache.backup.BackupOperation;
 import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.InternalLogWriter;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LogWriterFactory;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.logging.log4j.LogWriterAppender;
 import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
@@ -309,8 +307,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
   private void checkConnectCalled() {
     if (this.gfManagerAgent == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM
-              .toLocalizedString());
+          "connect() has not been invoked on this AdminDistributedSystem.");
     }
   }
 
@@ -507,15 +504,15 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
       try {
         if (!locs[i].waitToStart(TIMEOUT_MS)) {
           throw new AdminException(
-              LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_START_AFTER_1_MS
-                  .toLocalizedString(new Object[] {locs[i], Integer.valueOf(TIMEOUT_MS)}));
+              String.format("%s  did not start after  %s  ms",
+                  new Object[] {locs[i], Integer.valueOf(TIMEOUT_MS)}));
         }
 
       } catch (InterruptedException ex) {
         Thread.currentThread().interrupt();
         throw new AdminException(
-            LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_START
-                .toLocalizedString(locs[i]),
+            String.format("Interrupted while waiting for  %s  to start.",
+                locs[i]),
             ex);
       }
     }
@@ -528,15 +525,15 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
       try {
         if (!servers[i].waitToStart(TIMEOUT_MS)) {
           throw new AdminException(
-              LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_START_AFTER_1_MS
-                  .toLocalizedString(new Object[] {servers[i], Integer.valueOf(TIMEOUT_MS)}));
+              String.format("%s  did not start after  %s  ms",
+                  new Object[] {servers[i], Integer.valueOf(TIMEOUT_MS)}));
         }
 
       } catch (InterruptedException ex) {
         Thread.currentThread().interrupt();
         throw new AdminException(
-            LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_START
-                .toLocalizedString(servers[i]),
+            String.format("Interrupted while waiting for  %s  to start.",
+                servers[i]),
             ex);
       }
     }
@@ -561,15 +558,15 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
       try {
         if (!servers[i].waitToStop(timeout * 1000)) {
           throw new AdminException(
-              LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_STOP_AFTER_1_SECONDS
-                  .toLocalizedString(new Object[] {servers[i], Long.valueOf(timeout)}));
+              String.format("%s  did not stop after  %s  seconds.",
+                  new Object[] {servers[i], Long.valueOf(timeout)}));
         }
 
       } catch (InterruptedException ex) {
         Thread.currentThread().interrupt();
         throw new AdminException(
-            LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_STOP
-                .toLocalizedString(servers[i]),
+            String.format("Interrupted while waiting for  %s  to stop.",
+                servers[i]),
             ex);
       }
     }
@@ -582,15 +579,15 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
       try {
         if (!locs[i].waitToStop(timeout * 1000)) {
           throw new AdminException(
-              LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_STOP_AFTER_1_SECONDS
-                  .toLocalizedString(new Object[] {locs[i], Long.valueOf(timeout)}));
+              String.format("%s  did not stop after  %s  seconds.",
+                  new Object[] {locs[i], Long.valueOf(timeout)}));
         }
 
       } catch (InterruptedException ex) {
         Thread.currentThread().interrupt();
         throw new AdminException(
-            LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_STOP
-                .toLocalizedString(locs[i]),
+            String.format("Interrupted while waiting for  %s  to stop.",
+                locs[i]),
             ex);
       }
     }
@@ -650,8 +647,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     }
     if (cause instanceof CancelException) { // bug 37285
       throw new FutureCancelledException(
-          LocalizedStrings.AdminDistributedSystemImpl_FUTURE_CANCELLED_DUE_TO_SHUTDOWN
-              .toLocalizedString(),
+          "Future cancelled due to shutdown",
           ex);
     }
 
@@ -660,7 +656,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     // different thread. In addition to the cause, we also want to
     // know which code was waiting for the Future.
     throw new RuntimeAdminException(
-        LocalizedStrings.AdminDistributedSystemImpl_WHILE_WAITING_FOR_FUTURE.toLocalizedString(),
+        "While waiting for Future",
         ex);
   }
 
@@ -759,8 +755,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
 
       if (thisAdminDS != null) { // TODO: beef up toString and add thisAdminDS
         throw new IllegalStateException(
-            LocalizedStrings.AdminDistributedSystemImpl_ONLY_ONE_ADMINDISTRIBUTEDSYSTEM_CONNECTION_CAN_BE_MADE_AT_ONCE
-                .toLocalizedString());
+            "Only one AdminDistributedSystem connection can be made at once.");
       }
 
       thisAdminDS = this; // added for feature requests #32887
@@ -1089,10 +1084,8 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
             synchronized (this.cacheServerSet) {
               future = new AdminFutureTask(vm.getId(), new Callable() {
                 public Object call() throws Exception {
-                  logger.info(LogMarker.DM_MARKER,
-                      LocalizedMessage.create(
-                          LocalizedStrings.AdminDistributedSystemImpl_ADDING_NEW_CACHESERVER_FOR__0,
-                          vm));
+                  logger.info(LogMarker.DM_MARKER, "Adding new CacheServer for {}",
+                      vm);
                   return createCacheServer(app);
                 }
               });
@@ -1104,10 +1097,8 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
             synchronized (this.applicationSet) {
               future = new AdminFutureTask(vm.getId(), new Callable() {
                 public Object call() throws Exception {
-                  logger.info(LogMarker.DM_MARKER,
-                      LocalizedMessage.create(
-                          LocalizedStrings.AdminDistributedSystemImpl_ADDING_NEW_APPLICATION_FOR__0,
-                          vm));
+                  logger.info(LogMarker.DM_MARKER, "Adding new Application for {}",
+                      vm);
                   return createSystemMember(app);
                 }
               });
@@ -1400,8 +1391,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
       }
     } catch (IOException ex) {
       // oh well...
-      logger.info(LocalizedMessage
-          .create(LocalizedStrings.AdminDistributedSystemImpl_WHILE_GETTING_CANONICAL_FILE), ex);
+      logger.info("While getting canonical file", ex);
     }
 
     return false;
@@ -1504,8 +1494,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
         member.setGemFireVM(vm);
 
       } catch (AdminException ex) {
-        logger.warn(LocalizedMessage
-            .create(LocalizedStrings.AdminDistributedSystem_COULD_NOT_SET_THE_GEMFIRE_VM), ex);
+        logger.warn("Could not set the GemFire VM.", ex);
       }
     }
 
@@ -1607,7 +1596,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
           Thread.currentThread().interrupt();
           checkCancellation();
           throw new RuntimeException(
-              LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED.toLocalizedString(), ex);
+              "Interrupted", ex);
 
         } catch (CancellationException ex) {
           continue;
@@ -1633,8 +1622,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
         }
 
       } catch (AdminException ex) {
-        logger.fatal(LocalizedMessage
-            .create(LocalizedStrings.AdminDistributedSystem_UNEXPECTED_ADMINEXCEPTION), ex);
+        logger.fatal("Unexpected AdminException", ex);
       }
       return member;
 
@@ -1833,8 +1821,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
 
         } catch (AdminException ex) {
           throw new RuntimeAdminException(
-              LocalizedStrings.AdminDistributedSystemImpl_AN_ADMINEXCEPTION_WAS_THROWN_WHILE_GETTING_THE_GEMFIRE_HEALTH
-                  .toLocalizedString(),
+              "An AdminException was thrown while getting the GemFire health.",
               ex);
         }
       }
@@ -1854,8 +1841,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
 
     if (agent == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemImpl_GFMANAGERAGENT_MUST_NOT_BE_NULL
-              .toLocalizedString());
+          "GfManagerAgent must not be null");
     }
     return new GemFireHealthImpl(agent, this);
   }
@@ -2152,7 +2138,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
             // We interrupted the runnable but we don't want the thread
             // that called get() to think that the runnable was interrupted.
             CancellationException ex2 = new CancellationException(
-                LocalizedStrings.AdminDistributedSystemImpl_BY_INTERRUPT.toLocalizedString());
+                "by interrupt");
             ex2.setStackTrace(cause.getStackTrace());
             throw ex2;
           }
@@ -2183,8 +2169,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     DistributionManager dm = getDistributionManager();
     if (dm == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM
-              .toLocalizedString());
+          "connect() has not been invoked on this AdminDistributedSystem.");
     }
     return getMissingPersistentMembers(dm);
   }
@@ -2198,8 +2183,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     DistributionManager dm = getDistributionManager();
     if (dm == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM
-              .toLocalizedString());
+          "connect() has not been invoked on this AdminDistributedSystem.");
     }
     revokePersistentMember(dm, host, directory);
 
@@ -2210,8 +2194,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     DistributionManager dm = getDistributionManager();
     if (dm == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM
-              .toLocalizedString());
+          "connect() has not been invoked on this AdminDistributedSystem.");
     }
     revokePersistentMember(dm, diskStoreID);
 
@@ -2286,8 +2269,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     DistributionManager dm = getDistributionManager();
     if (dm == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM
-              .toLocalizedString());
+          "connect() has not been invoked on this AdminDistributedSystem.");
     }
     return shutDownAllMembers(dm, timeout);
   }
@@ -2313,8 +2295,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     DistributionManager dm = getDistributionManager();
     if (dm == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM
-              .toLocalizedString());
+          "connect() has not been invoked on this AdminDistributedSystem.");
     }
     return backupAllMembers(dm, targetDir, baselineDir);
   }
@@ -2331,8 +2312,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     DistributionManager dm = getDistributionManager();
     if (dm == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM
-              .toLocalizedString());
+          "connect() has not been invoked on this AdminDistributedSystem.");
     }
     return compactAllDiskStores(dm);
   }
@@ -2368,7 +2348,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
     } else {
       System.out.println("ERROR:: " + level
           + " is invalid. Allowed alert levels are: WARNING, ERROR, SEVERE, OFF");
-      throw new IllegalArgumentException(LocalizedStrings.DEBUG.toLocalizedString(
+      throw new IllegalArgumentException(String.format("%s",
           level + " is invalid. Allowed alert levels are: WARNING, ERROR, SEVERE, OFF"));
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java
index adf03ca..a35b8dd 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java
@@ -29,7 +29,6 @@ import org.apache.geode.internal.cache.CacheLifecycleListener;
 import org.apache.geode.internal.cache.CachePerfStats;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -151,8 +150,9 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator implements CacheLifec
 
       if (ratio > threshold) {
         String s =
-            LocalizedStrings.CacheHealthEvaluator_THE_AVERAGE_DURATION_OF_A_CACHE_NETSEARCH_0_MS_EXCEEDS_THE_THRESHOLD_1_MS
-                .toLocalizedString(ratio, threshold);
+            String.format(
+                "The average duration of a Cache netSearch (%s ms) exceeds the threshold (%s ms)",
+                ratio, threshold);
         status.add(okayHealth(s));
       }
     }
@@ -186,8 +186,9 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator implements CacheLifec
 
         if (ratio > threshold) {
           String s =
-              LocalizedStrings.CacheHealthEvaluator_THE_AVERAGE_DURATION_OF_A_CACHE_LOAD_0_MS_EXCEEDS_THE_THRESHOLD_1_MS
-                  .toLocalizedString(ratio, threshold);
+              String.format(
+                  "The average duration of a Cache load (%s ms) exceeds the threshold (%s ms)",
+                  ratio, threshold);
           if (logger.isDebugEnabled()) {
             logger.debug(s);
           }
@@ -251,8 +252,8 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator implements CacheLifec
     long threshold = this.config.getMaxEventQueueSize();
     if (eventQueueSize > threshold) {
       String s =
-          LocalizedStrings.CacheHealthEvaluator_THE_SIZE_OF_THE_CACHE_EVENT_QUEUE_0_MS_EXCEEDS_THE_THRESHOLD_1_MS
-              .toLocalizedString(eventQueueSize, threshold);
+          String.format("The size of the cache event queue (%s ms) exceeds the threshold (%s ms)",
+              eventQueueSize, threshold);
       status.add(okayHealth(s));
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
index 7964c10..564cfb6 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
@@ -22,7 +22,6 @@ import java.util.List;
 
 import org.apache.geode.admin.ConfigurationParameter;
 import org.apache.geode.admin.UnmodifiableConfigurationException;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * A single configuration parameter of a system member.
@@ -62,8 +61,7 @@ public class ConfigurationParameterImpl implements org.apache.geode.admin.Config
       boolean userModifiable) {
     if (name == null || name.length() == 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_NAME_MUST_BE_SPECIFIED
-              .toLocalizedString());
+          "ConfigurationParameter name must be specified");
     }
 
     this.name = name;
@@ -79,8 +77,7 @@ public class ConfigurationParameterImpl implements org.apache.geode.admin.Config
   protected ConfigurationParameterImpl(String name, Object value) {
     if (name == null || name.length() == 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_NAME_MUST_BE_SPECIFIED
-              .toLocalizedString());
+          "ConfigurationParameter name must be specified");
     }
 
     this.name = name;
@@ -158,19 +155,19 @@ public class ConfigurationParameterImpl implements org.apache.geode.admin.Config
   public void setValue(Object value) throws UnmodifiableConfigurationException {
     if (!isModifiable()) {
       throw new UnmodifiableConfigurationException(
-          LocalizedStrings.ConfigurationParameterImpl_0_IS_NOT_A_MODIFIABLE_CONFIGURATION_PARAMETER
-              .toLocalizedString(getName()));
+          String.format("%s  is not a modifiable configuration parameter",
+              getName()));
     }
     if (value == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE
-              .toLocalizedString(getName()));
+          String.format("Unable to set  %s  to null value",
+              getName()));
     }
     if (!getValueType().equals(value.getClass())) {
       throw new IllegalArgumentException(
-          LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_TYPE_0_WITH_TYPE_1
-              .toLocalizedString(
-                  new Object[] {getValueType().getName(), value.getClass().getName()}));
+          String.format("Unable to set type  %s  with type  %s",
+
+              new Object[] {getValueType().getName(), value.getClass().getName()}));
     }
 
     if (value instanceof String && !isString()) {
@@ -208,8 +205,8 @@ public class ConfigurationParameterImpl implements org.apache.geode.admin.Config
   protected void setValueFromString(String newValue) {
     if (newValue == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE
-              .toLocalizedString(getName()));
+          String.format("Unable to set  %s  to null value",
+              getName()));
     }
 
     if (isInetAddress()) {
@@ -224,8 +221,7 @@ public class ConfigurationParameterImpl implements org.apache.geode.admin.Config
     } else if (isArray()) {
       // parse it TODO
       throw new IllegalArgumentException(
-          LocalizedStrings.ConfigurationParameterImpl_SETTING_ARRAY_VALUE_FROM_DELIMITED_STRING_IS_NOT_SUPPORTED
-              .toLocalizedString());
+          "Setting array value from delimited string is not supported");
     } else {
       this.value = newValue;
     }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
index 1eecda2..35519c3 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
@@ -48,7 +48,6 @@ import org.apache.geode.admin.DistributionLocator;
 import org.apache.geode.admin.DistributionLocatorConfig;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionConfigImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.InternalLogWriter;
 import org.apache.geode.internal.logging.LogConfig;
 import org.apache.geode.internal.logging.LogService;
@@ -158,8 +157,7 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
   public DistributedSystemConfigImpl(DistributionConfig distConfig, String remoteCommand) {
     if (distConfig == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DistributedSystemConfigImpl_DISTRIBUTIONCONFIG_MUST_NOT_BE_NULL
-              .toLocalizedString());
+          "DistributionConfig must not be null.");
     }
 
     this.mcastAddress = InetAddressUtil.toString(distConfig.getMcastAddress());
@@ -238,8 +236,8 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
         this.refreshInterval = Integer.parseInt(refreshInterval);
       } catch (NumberFormatException nfEx) {
         throw new IllegalArgumentException(
-            LocalizedStrings.DistributedSystemConfigImpl_0_IS_NOT_A_VALID_INTEGER_1
-                .toLocalizedString(new Object[] {refreshInterval, REFRESH_INTERVAL_NAME}));
+            String.format("%s is not a valid integer for %s",
+                new Object[] {refreshInterval, REFRESH_INTERVAL_NAME}));
       }
     }
   }
@@ -324,8 +322,7 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
   protected void checkReadOnly() {
     if (this.system != null) {
       throw new IllegalStateException(
-          LocalizedStrings.DistributedSystemConfigImpl_A_DISTRIBUTEDSYSTEMCONFIG_OBJECT_CANNOT_BE_MODIFIED_AFTER_IT_HAS_BEEN_USED_TO_CREATE_AN_ADMINDISTRIBUTEDSYSTEM
-              .toLocalizedString());
+          "A DistributedSystemConfig object cannot be modified after it has been used to create an AdminDistributedSystem.");
     }
   }
 
@@ -353,8 +350,8 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
         return;
       } else {
         throw new AdminXmlException(
-            LocalizedStrings.DistributedSystemConfigImpl_ENTITY_CONFIGURATION_XML_FILE_0_DOES_NOT_EXIST
-                .toLocalizedString(fileName));
+            String.format("Entity configuration XML file %s does not exist",
+                fileName));
       }
     }
 
@@ -367,7 +364,7 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
       }
     } catch (IOException ex) {
       throw new AdminXmlException(
-          LocalizedStrings.DistributedSystemConfigImpl_WHILE_PARSING_0.toLocalizedString(fileName),
+          String.format("While parsing %s", fileName),
           ex);
     }
   }
@@ -476,9 +473,10 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
           this.membershipPortRange = membershipPortRangeStr;
         } else {
           throw new IllegalArgumentException(
-              LocalizedStrings.DistributedSystemConfigImpl_INVALID_VALUE_FOR_MEMBERSHIP_PORT_RANGE
-                  .toLocalizedString(
-                      new Object[] {membershipPortRangeStr, MEMBERSHIP_PORT_RANGE_NAME}));
+              String.format(
+                  "The value specified %s is invalid for the property : %s. This range should be specified as min-max.",
+
+                  new Object[] {membershipPortRangeStr, MEMBERSHIP_PORT_RANGE_NAME}));
         }
       } catch (Exception e) {
         if (logger.isDebugEnabled()) {
@@ -599,8 +597,8 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
   private void basicSetBindAddress(String bindAddress) {
     if (!validateBindAddress(bindAddress)) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DistributedSystemConfigImpl_INVALID_BIND_ADDRESS_0
-              .toLocalizedString(bindAddress));
+          String.format("Invalid bind address:  %s",
+              bindAddress));
     }
     this.bindAddress = bindAddress;
   }
@@ -608,8 +606,8 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
   private void basicSetServerBindAddress(String bindAddress) {
     if (!validateBindAddress(bindAddress)) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DistributedSystemConfigImpl_INVALID_BIND_ADDRESS_0
-              .toLocalizedString(bindAddress));
+          String.format("Invalid bind address:  %s",
+              bindAddress));
     }
     this.serverBindAddress = bindAddress;
   }
@@ -1003,9 +1001,9 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
   public void validate() {
     if (this.getMcastPort() < MIN_MCAST_PORT || this.getMcastPort() > MAX_MCAST_PORT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DistributedSystemConfigImpl_MCASTPORT_MUST_BE_AN_INTEGER_INCLUSIVELY_BETWEEN_0_AND_1
-              .toLocalizedString(
-                  new Object[] {Integer.valueOf(MIN_MCAST_PORT), Integer.valueOf(MAX_MCAST_PORT)}));
+          String.format("mcastPort must be an integer inclusively between  %s  and  %s",
+
+              new Object[] {Integer.valueOf(MIN_MCAST_PORT), Integer.valueOf(MAX_MCAST_PORT)}));
     }
 
     LogLevel.getLogWriterLevel(this.logLevel);
@@ -1013,16 +1011,16 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
     if (this.logFileSizeLimit < MIN_LOG_FILE_SIZE_LIMIT
         || this.logFileSizeLimit > MAX_LOG_FILE_SIZE_LIMIT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DistributedSystemConfigImpl_LOGFILESIZELIMIT_MUST_BE_AN_INTEGER_BETWEEN_0_AND_1
-              .toLocalizedString(new Object[] {Integer.valueOf(MIN_LOG_FILE_SIZE_LIMIT),
+          String.format("LogFileSizeLimit must be an integer between  %s  and  %s",
+              new Object[] {Integer.valueOf(MIN_LOG_FILE_SIZE_LIMIT),
                   Integer.valueOf(MAX_LOG_FILE_SIZE_LIMIT)}));
     }
 
     if (this.logDiskSpaceLimit < MIN_LOG_DISK_SPACE_LIMIT
         || this.logDiskSpaceLimit > MAX_LOG_DISK_SPACE_LIMIT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DistributedSystemConfigImpl_LOGDISKSPACELIMIT_MUST_BE_AN_INTEGER_BETWEEN_0_AND_1
-              .toLocalizedString(new Object[] {Integer.valueOf(MIN_LOG_DISK_SPACE_LIMIT),
+          String.format("LogDiskSpaceLimit must be an integer between  %s  and  %s",
+              new Object[] {Integer.valueOf(MIN_LOG_DISK_SPACE_LIMIT),
                   Integer.valueOf(MAX_LOG_DISK_SPACE_LIMIT)}));
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
index 2023d54..67b414b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
@@ -23,7 +23,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.MembershipListener;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Contains the logic for evaluating the health of an entire GemFire distributed system according to
@@ -116,9 +115,10 @@ class DistributedSystemHealthEvaluator extends AbstractHealthEvaluator
       long threshold = this.config.getMaxDepartedApplications();
       if (this.crashedApplications > threshold) {
         String s =
-            LocalizedStrings.DistributedSystemHealth_THE_NUMBER_OF_APPLICATIONS_THAT_HAVE_LEFT_THE_DISTRIBUTED_SYSTEM_0_EXCEEDS_THE_THRESHOLD_1
-                .toLocalizedString(
-                    new Object[] {Long.valueOf(this.crashedApplications), Long.valueOf(threshold)});
+            String.format(
+                "The number of applications that have left the distributed system (%s) exceeds the threshold (%s)",
+
+                new Object[] {Long.valueOf(this.crashedApplications), Long.valueOf(threshold)});
         status.add(poorHealth(s));
       }
       this.crashedApplications = 0;
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
index bd888b2..ae8f659 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
@@ -42,10 +42,8 @@ import org.apache.geode.internal.admin.Stat;
 import org.apache.geode.internal.admin.StatAlertDefinition;
 import org.apache.geode.internal.admin.StatListener;
 import org.apache.geode.internal.admin.StatResource;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LoggingThread;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.net.SocketCreator;
 
 /**
@@ -107,8 +105,8 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
     this.okayDiagnoses = new ArrayList();
     this.poorDiagnoses = new ArrayList();
 
-    String name = LocalizedStrings.DistributedSystemHealthMonitor_HEALTH_MONITOR_FOR_0
-        .toLocalizedString(eval.getDescription());
+    String name = String.format("Health monitor for %s",
+        eval.getDescription());
     this.thread = new LoggingThread(name, this);
   }
 
@@ -194,9 +192,7 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
         this.thread.join();
       } catch (InterruptedException ex) {
         Thread.currentThread().interrupt();
-        logger.warn(
-            LocalizedMessage.create(
-                LocalizedStrings.DistributedSystemHealthMonitor_INTERRUPTED_WHILE_STOPPING_HEALTH_MONITOR_THREAD),
+        logger.warn("Interrupted while stopping health monitor thread",
             ex);
       }
     }
@@ -210,8 +206,7 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
 
     } catch (Exception ex) {
       throw new org.apache.geode.InternalGemFireException(
-          LocalizedStrings.DistributedSystemHealthMonitor_COULD_NOT_GET_LOCALHOST
-              .toLocalizedString());
+          "Could not get localhost?!");
     }
   }
 
@@ -221,58 +216,58 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
 
   public java.io.File getWorkingDirectory() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public java.io.File getGeodeHomeDir() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public java.util.Date getBirthDate() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public Properties getLicenseInfo() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public GemFireMemberStatus getSnapshot() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public RegionSubRegionSnapshot getRegionSnapshot() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public StatResource[] getStats(String statisticsTypeName) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public StatResource[] getAllStats() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public DLockInfo[] getDistributedLockInfo() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public void addStatListener(StatListener observer, StatResource observedResource,
       Stat observedStat) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public void removeStatListener(StatListener observer) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public void addHealthListener(HealthListener observer, GemFireHealthConfig cfg) {
@@ -306,124 +301,124 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
 
   public Config getConfig() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public void setConfig(Config cfg) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public GfManagerAgent getManagerAgent() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public String[] getSystemLogs() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public void setInspectionClasspath(String classpath) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public String getInspectionClasspath() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public Region[] getRootRegions() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public Region getRegion(CacheInfo c, String path) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public Region createVMRootRegion(CacheInfo c, String name, RegionAttributes attrs) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public Region createSubregion(CacheInfo c, String parentPath, String name,
       RegionAttributes attrs) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public void setCacheInspectionMode(int mode) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public int getCacheInspectionMode() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public void takeRegionSnapshot(String regionName, int snapshotId) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public InternalDistributedMember getId() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public CacheInfo getCacheInfo() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public String getVersionInfo() {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public CacheInfo setCacheLockTimeout(CacheInfo c, int v) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public CacheInfo setCacheLockLease(CacheInfo c, int v) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public CacheInfo setCacheSearchTimeout(CacheInfo c, int v) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public AdminBridgeServer addCacheServer(CacheInfo cache) throws AdminException {
 
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public AdminBridgeServer getBridgeInfo(CacheInfo cache, int id) throws AdminException {
 
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public AdminBridgeServer startBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
       throws AdminException {
 
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   public AdminBridgeServer stopBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
       throws AdminException {
 
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   /**
@@ -433,7 +428,7 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
   public void setAlertsManager(StatAlertDefinition[] alertDefs, long refreshInterval,
       boolean setRemotely) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   /**
@@ -442,7 +437,7 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
    */
   public void setRefreshInterval(long refreshInterval) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 
   /**
@@ -451,6 +446,6 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
    */
   public void updateAlertDefinitions(StatAlertDefinition[] alertDefs, int actionCode) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+        "Not a real GemFireVM");
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
index f5486c9..32dec35 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
@@ -23,7 +23,6 @@ import org.apache.geode.GemFireConfigException;
 import org.apache.geode.admin.DistributionLocator;
 import org.apache.geode.admin.DistributionLocatorConfig;
 import org.apache.geode.distributed.internal.tcpserver.TcpClient;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Provides an implementation of <code>DistributionLocatorConfig</code>.
@@ -155,15 +154,15 @@ public class DistributionLocatorConfigImpl extends ManagedEntityConfigImpl
 
     if (port < MIN_PORT || port > MAX_PORT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DistributionLocatorConfigImpl_PORT_0_MUST_BE_AN_INTEGER_BETWEEN_1_AND_2
-              .toLocalizedString(new Object[] {Integer.valueOf(port), Integer.valueOf(MIN_PORT),
+          String.format("Port ( %s ) must be an integer between  %s  and  %s",
+              new Object[] {Integer.valueOf(port), Integer.valueOf(MIN_PORT),
                   Integer.valueOf(MAX_PORT)}));
     }
 
     if (this.bindAddress != null && InetAddressUtil.validateHost(this.bindAddress) == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DistributionLocatorConfigImpl_INVALID_HOST_0
-              .toLocalizedString(this.bindAddress));
+          String.format("Invalid host %s",
+              this.bindAddress));
     }
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
index e66a5c1..42865b0 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
@@ -33,9 +33,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.admin.remote.DistributionLocatorId;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Default administrative implementation of a DistributionLocator.
@@ -125,8 +123,7 @@ public class DistributionLocatorImpl implements DistributionLocator, InternalMan
    */
   public int setState(int state) {
     throw new UnsupportedOperationException(
-        LocalizedStrings.DistributionLocatorImpl_CAN_NOT_SET_THE_STATE_OF_A_LOCATOR
-            .toLocalizedString());
+        "Can not set the state of a locator.");
   }
 
   // -------------------------------------------------------------------------
@@ -151,8 +148,7 @@ public class DistributionLocatorImpl implements DistributionLocator, InternalMan
       }
     }
 
-    logger.info(
-        LocalizedMessage.create(LocalizedStrings.DistributionLocatorImpl_DONE_WAITING_FOR_LOCATOR));
+    logger.info("Done waiting for locator");
     return this.isRunning();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
index 9a19b10..354c94e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
@@ -32,10 +32,8 @@ import org.apache.geode.admin.ManagedEntity;
 import org.apache.geode.admin.ManagedEntityConfig;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.ProcessOutputReader;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LoggingThread;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Implements the actual administration (starting, stopping, etc.) of GemFire
@@ -110,35 +108,29 @@ class EnabledManagedEntityController implements ManagedEntityController {
      */
     if (command == null || command.length() == 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.ManagedEntityController_EXECUTION_COMMAND_IS_EMPTY.toLocalizedString());
+          "Execution command is empty");
     }
 
     File workingDir = new File(entity.getEntityConfig().getWorkingDirectory());
-    logger.info(LocalizedMessage.create(
-        LocalizedStrings.ManagedEntityController_EXECUTING_REMOTE_COMMAND_0_IN_DIRECTORY_1,
-        new Object[] {command, workingDir}));
+    logger.info("Executing remote command: {} in directory {}",
+        command, workingDir);
     Process p = null;
     try {
       p = Runtime.getRuntime().exec(command, null /* env */, workingDir);
 
     } catch (java.io.IOException e) {
-      logger.fatal(LocalizedMessage
-          .create(LocalizedStrings.ManagedEntityController_WHILE_EXECUTING_0, command), e);
+      logger.fatal("While executing " + command, e);
       return null;
     }
 
     final ProcessOutputReader pos = new ProcessOutputReader(p);
     int retCode = pos.getExitCode();
     final String output = pos.getOutput();
-    logger.info(
-        LocalizedMessage.create(LocalizedStrings.ManagedEntityController_RESULT_OF_EXECUTING_0_IS_1,
-            new Object[] {command, Integer.valueOf(retCode)}));
-    logger.info(LocalizedMessage.create(LocalizedStrings.ManagedEntityController_OUTPUT_OF_0_IS_1,
-        new Object[] {command, output}));
+    logger.info("Result of executing {} is {}", command, Integer.valueOf(retCode));
+    logger.info("Output of {} is {}", command, output);
 
     if (retCode != 0 || outputIsError(output)) {
-      logger.warn(LocalizedMessage
-          .create(LocalizedStrings.ManagedEntityController_REMOTE_EXECUTION_OF_0_FAILED, command));
+      logger.warn("Remote execution of {} failed.", command);
       return null;
     }
 
@@ -189,8 +181,9 @@ class EnabledManagedEntityController implements ManagedEntityController {
 
     if (prefix == null || prefix.length() <= 0) {
       throw new IllegalStateException(
-          LocalizedStrings.ManagedEntityController_A_REMOTE_COMMAND_MUST_BE_SPECIFIED_TO_OPERATE_ON_A_MANAGED_ENTITY_ON_HOST_0
-              .toLocalizedString(host));
+          String.format(
+              "A remote command must be specified to operate on a managed entity on host %s",
+              host));
     }
 
     int hostIdx = prefix.indexOf(HOST);
@@ -337,8 +330,8 @@ class EnabledManagedEntityController implements ManagedEntityController {
 
     } else {
       throw new IllegalStateException(
-          LocalizedStrings.ManagedEntityController_COULD_NOT_DETERMINE_IF_MANAGED_ENTITY_WAS_RUNNING_0
-              .toLocalizedString(output));
+          String.format("Could not determine if managed entity was running: %s",
+              output));
     }
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
index 98dc311..e314f05 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
@@ -15,7 +15,6 @@
 package org.apache.geode.admin.internal;
 
 import org.apache.geode.admin.GemFireHealthConfig;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 // @todo davidw Delegate to a "parent" config for properties that are not overridden.
 // This will be made easier with a special <code>HealthConfigAttribute</code> class.
@@ -68,12 +67,11 @@ public class GemFireHealthConfigImpl extends CacheHealthConfigImpl implements Ge
   @Override
   public String toString() {
     if (this.hostName == null) {
-      return LocalizedStrings.GemFireHealthConfigImpl_DEFAULT_GEMFIRE_HEALTH_CONFIGURATION
-          .toLocalizedString();
+      return "Default GemFire health configuration";
 
     } else {
-      return LocalizedStrings.GemFireHealthConfigImpl_GEMFIRE_HEALTH_CONFIGURATION_FOR_HOST_0
-          .toLocalizedString(this.hostName);
+      return String.format("GemFire health configuration for host %s",
+          this.hostName);
     }
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java
index f3cdc56..49ba6fc 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java
@@ -24,7 +24,6 @@ import org.apache.geode.admin.GemFireHealth;
 import org.apache.geode.admin.GemFireHealthConfig;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -76,7 +75,7 @@ public class GemFireHealthEvaluator {
   public GemFireHealthEvaluator(GemFireHealthConfig config, ClusterDistributionManager dm) {
     if (config == null) {
       throw new NullPointerException(
-          LocalizedStrings.GemFireHealthEvaluator_NULL_GEMFIREHEALTHCONFIG.toLocalizedString());
+          "Null GemFireHealthConfig");
     }
 
     this.config = config;
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
index 3abda49..26a3fe7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.admin.GemFireVM;
 import org.apache.geode.internal.admin.GfManagerAgent;
 import org.apache.geode.internal.admin.HealthListener;
 import org.apache.geode.internal.admin.JoinLeaveListener;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Provides the implementation of the <code>GemFireHealth</code> administration API. This class is
@@ -166,8 +165,7 @@ public class GemFireHealthImpl implements GemFireHealth, JoinLeaveListener, Heal
   private void checkClosed() {
     if (this.isClosed) {
       throw new IllegalStateException(
-          LocalizedStrings.GemFireHealthImpl_CANNOT_ACCESS_A_CLOSED_GEMFIREHEALTH_INSTANCE
-              .toLocalizedString());
+          "Cannot access a closed GemFireHealth instance.");
     }
   }
 
@@ -268,8 +266,8 @@ public class GemFireHealthImpl implements GemFireHealth, JoinLeaveListener, Heal
 
     if (config.getHostName() != null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.GemFireHealthImpl_THE_GEMFIREHEALTHCONFIG_FOR_FOR_0_CANNOT_SERVE_AS_THE_DEFAULT_HEALTH_CONFIG
-              .toLocalizedString(config.getHostName()));
+          String.format("The GemFireHealthConfig for %s cannot serve as the default health config.",
+              config.getHostName()));
     }
 
     this.defaultConfig = config;
@@ -317,8 +315,8 @@ public class GemFireHealthImpl implements GemFireHealth, JoinLeaveListener, Heal
       hostIpAddress = InetAddress.getByName(hostName);
     } catch (UnknownHostException e) {
       throw new IllegalArgumentException(
-          LocalizedStrings.GemFireHealthImpl_COULD_NOT_FIND_A_HOST_WITH_NAME_0
-              .toLocalizedString(hostName),
+          String.format("Could not find a host with name %s.",
+              hostName),
           e);
     }
 
@@ -365,16 +363,16 @@ public class GemFireHealthImpl implements GemFireHealth, JoinLeaveListener, Heal
         hostIpAddress = InetAddress.getByName(hostName);
       } catch (UnknownHostException e) {
         throw new IllegalArgumentException(
-            LocalizedStrings.GemFireHealthImpl_COULD_NOT_FIND_A_HOST_WITH_NAME_0
-                .toLocalizedString(hostName),
+            String.format("Could not find a host with name %s.",
+                hostName),
             e);
       }
 
       List members = (List) this.hostMembers.get(hostIpAddress);
       if (members == null || members.isEmpty()) {
         throw new IllegalArgumentException(
-            LocalizedStrings.GemFireHealthImpl_THERE_ARE_NO_GEMFIRE_COMPONENTS_ON_HOST_0
-                .toLocalizedString(hostName));
+            String.format("There are no GemFire components on host %s.",
+                hostName));
       }
 
       for (Iterator iter = members.iterator(); iter.hasNext();) {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java b/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
index 3141d3f..7e6c0ef 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
@@ -23,7 +23,6 @@ import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.GemFireIOException;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.net.SocketCreator;
 
@@ -155,8 +154,7 @@ public class InetAddressUtil {
           return false;
         } catch (SocketException e) {
           throw new GemFireIOException(
-              LocalizedStrings.InetAddressUtil_UNABLE_TO_QUERY_NETWORK_INTERFACE
-                  .toLocalizedString(),
+              "Unable to query network interface",
               e);
         }
       }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
index dc8a793..08ddcf3 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
@@ -22,7 +22,6 @@ import java.net.UnknownHostException;
 import org.apache.geode.admin.ManagedEntityConfig;
 import org.apache.geode.internal.GemFireVersion;
 import org.apache.geode.internal.admin.GemFireVM;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.net.SocketCreator;
 
 /**
@@ -64,8 +63,7 @@ public abstract class ManagedEntityConfigImpl implements ManagedEntityConfig {
 
     } catch (UnknownHostException ex) {
       IllegalStateException ex2 = new IllegalStateException(
-          LocalizedStrings.ManagedEntityConfigImpl_COULD_NOT_DETERMINE_LOCALHOST
-              .toLocalizedString());
+          "Could not determine localhost?!");
       ex2.initCause(ex);
       throw ex2;
     }
@@ -87,7 +85,7 @@ public abstract class ManagedEntityConfigImpl implements ManagedEntityConfig {
     URL url = GemFireVersion.getJarURL();
     if (url == null) {
       throw new IllegalStateException(
-          LocalizedStrings.ManagedEntityConfigImpl_COULD_NOT_FIND_GEMFIREJAR.toLocalizedString());
+          "Could not find gemfire.jar.");
     }
 
     File gemfireJar = new File(url.getPath());
@@ -142,8 +140,7 @@ public abstract class ManagedEntityConfigImpl implements ManagedEntityConfig {
   public void checkReadOnly() {
     if (this.isReadOnly()) {
       throw new IllegalStateException(
-          LocalizedStrings.ManagedEntityConfigImpl_THIS_CONFIGURATION_CANNOT_BE_MODIFIED_WHILE_ITS_MANAGED_ENTITY_IS_RUNNING
-              .toLocalizedString());
+          "This configuration cannot be modified while its managed entity is running.");
     }
   }
 
@@ -219,7 +216,7 @@ public abstract class ManagedEntityConfigImpl implements ManagedEntityConfig {
   public void validate() {
     if (InetAddressUtil.validateHost(this.host) == null) {
       throw new IllegalStateException(
-          LocalizedStrings.ManagedEntityConfigImpl_INVALID_HOST_0.toLocalizedString(this.host));
+          String.format("Invalid host %s", this.host));
     }
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
index cb68f01..519d2e8 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
@@ -25,7 +25,6 @@ import org.xml.sax.SAXParseException;
 
 import org.apache.geode.distributed.ConfigurationProperties;
 import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * The abstract superclass of classes that convert XML into a
@@ -118,8 +117,8 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
   public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
 
     if (publicId == null || systemId == null) {
-      throw new SAXException(LocalizedStrings.ManagedEntityConfigXml_PUBLIC_ID_0_SYSTEM_ID_1
-          .toLocalizedString(new Object[] {publicId, systemId}));
+      throw new SAXException(String.format("Public Id: %s System Id: %s",
+          new Object[] {publicId, systemId}));
     }
 
     // Figure out the location for the publicId.
@@ -132,7 +131,7 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
         result = new InputSource(stream);
       } else {
         throw new SAXNotRecognizedException(
-            LocalizedStrings.ManagedEntityConfigXml_DTD_NOT_FOUND_0.toLocalizedString(location));
+            String.format("DTD not found:  %s", location));
       }
     }
 
@@ -151,7 +150,7 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
    */
   public void error(SAXParseException ex) throws SAXException {
     IllegalArgumentException ex2 = new IllegalArgumentException(
-        LocalizedStrings.ManagedEntityConfigXml_ERROR_WHILE_PARSING_XML.toLocalizedString());
+        "Error while parsing XML.");
     ex2.initCause(ex);
     throw ex2;
   }
@@ -161,7 +160,7 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
    */
   public void fatalError(SAXParseException ex) throws SAXException {
     IllegalArgumentException ex2 = new IllegalArgumentException(
-        LocalizedStrings.ManagedEntityConfigXml_FATAL_ERROR_WHILE_PARSING_XML.toLocalizedString());
+        "Fatal error while parsing XML.");
     ex2.initCause(ex);
     throw ex2;
   }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
index 54f703e..64f5ffb 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
@@ -49,7 +49,6 @@ import org.apache.geode.admin.DistributionLocator;
 import org.apache.geode.admin.DistributionLocatorConfig;
 import org.apache.geode.admin.ManagedEntityConfig;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Generates XML data that represents the managed entities in an
@@ -115,8 +114,7 @@ public class ManagedEntityConfigXmlGenerator extends ManagedEntityConfigXml impl
 
     } catch (Exception ex) {
       RuntimeException ex2 = new RuntimeException(
-          LocalizedStrings.ManagedEntityConfigXmlGenerator_EXCEPTION_THROWN_WHILE_GENERATING_XML
-              .toLocalizedString());
+          "Exception thrown while generating XML.");
       ex2.initCause(ex);
       throw ex2;
     }
@@ -146,8 +144,7 @@ public class ManagedEntityConfigXmlGenerator extends ManagedEntityConfigXml impl
 
     } catch (AdminException ex) {
       throw new SAXException(
-          LocalizedStrings.ManagedEntityConfigXmlGenerator_AN_ADMINEXCEPTION_WAS_THROWN_WHILE_GENERATING_XML
-              .toLocalizedString(),
+          "An AdminException was thrown while generating XML.",
           ex);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
index 98a4045..7800441 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
@@ -34,7 +34,6 @@ import org.apache.geode.admin.DistributedSystemConfig;
 import org.apache.geode.admin.DistributionLocatorConfig;
 import org.apache.geode.admin.ManagedEntityConfig;
 import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Parses an XML file and configures a {@link DistributedSystemConfig} from it.
@@ -85,7 +84,7 @@ public class ManagedEntityConfigXmlParser extends ManagedEntityConfigXml impleme
       }
 
       throw new AdminXmlException(
-          LocalizedStrings.ManagedEntityConfigXmlParser_WHILE_PARSING_XML.toLocalizedString(), ex);
+          "While parsing XML", ex);
     }
   }
 
@@ -100,7 +99,7 @@ public class ManagedEntityConfigXmlParser extends ManagedEntityConfigXml impleme
 
     } catch (NumberFormatException ex) {
       throw new AdminXmlException(
-          LocalizedStrings.ManagedEntityConfigXmlParser_MALFORMED_INTEGER_0.toLocalizedString(s),
+          String.format("Malformed integer %s", s),
           ex);
     }
   }
@@ -160,8 +159,8 @@ public class ManagedEntityConfigXmlParser extends ManagedEntityConfigXml impleme
 
     } else {
       throw new AdminXmlException(
-          LocalizedStrings.ManagedEntityConfigXmlParser_UNKNOWN_XML_ELEMENT_0
-              .toLocalizedString(qName));
+          String.format("Unknown XML element %s",
+              qName));
     }
   }
 
@@ -217,8 +216,8 @@ public class ManagedEntityConfigXmlParser extends ManagedEntityConfigXml impleme
 
     } else {
       throw new AdminXmlException(
-          LocalizedStrings.ManagedEntityConfigXmlParser_UNKNOWN_XML_ELEMENT_0
-              .toLocalizedString(qName));
+          String.format("Unknown XML element %s",
+              qName));
     }
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
index 57ba1b2..d26edb5 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
@@ -26,7 +26,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.internal.OSProcess;
 import org.apache.geode.internal.cache.CachePerfStats;
 import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.statistics.GemFireStatSampler;
 import org.apache.geode.internal.statistics.platform.ProcessStats;
 
@@ -101,8 +100,8 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
     long threshold = this.config.getMaxVMProcessSize();
     if (vmSize > threshold) {
       String s =
-          LocalizedStrings.MemberHealthEvaluator_THE_SIZE_OF_THIS_VM_0_MEGABYTES_EXCEEDS_THE_THRESHOLD_1_MEGABYTES
-              .toLocalizedString(vmSize, threshold);
+          String.format("The size of this VM (%s megabytes) exceeds the threshold (%s megabytes)",
+              vmSize, threshold);
       status.add(okayHealth(s));
     }
   }
@@ -118,8 +117,8 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
     long overflowSize = this.dmStats.getOverflowQueueSize();
     if (overflowSize > threshold) {
       String s =
-          LocalizedStrings.MemberHealthEvaluator_THE_SIZE_OF_THE_OVERFLOW_QUEUE_0_EXCEEDS_THE_THRESHOLD_1
-              .toLocalizedString(overflowSize, threshold);
+          String.format("The size of the overflow queue (%s) exceeds the threshold (%s).",
+              overflowSize, threshold);
       status.add(okayHealth(s));
     }
   }
@@ -138,8 +137,8 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
     long deltaReplyTimeouts = this.dmStats.getReplyTimeouts() - prevReplyTimeouts;
     if (deltaReplyTimeouts > threshold) {
       String s =
-          LocalizedStrings.MemberHealthEvaluator_THE_NUMBER_OF_MESSAGE_REPLY_TIMEOUTS_0_EXCEEDS_THE_THRESHOLD_1
-              .toLocalizedString(deltaReplyTimeouts, threshold);
+          String.format("The number of message reply timeouts (%s) exceeds the threshold (%s)",
+              deltaReplyTimeouts, threshold);
       status.add(okayHealth(s));
     }
   }
@@ -159,20 +158,23 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
         // health is okay.
         int numRegions = cPStats.getReliableRegionsMissingFullAccess();
         status.add(okayHealth(
-            LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_BUT_ARE_CONFIGURED_FOR_FULL_ACCESS
-                .toLocalizedString(numRegions)));
+            String.format(
+                "There are %s regions missing required roles; however, they are configured for full access.",
+                numRegions)));
       } else if (cPStats.getReliableRegionsMissingLimitedAccess() > 0) {
         // health is poor
         int numRegions = cPStats.getReliableRegionsMissingLimitedAccess();
         status.add(poorHealth(
-            LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_AND_CONFIGURED_WITH_LIMITED_ACCESS
-                .toLocalizedString(numRegions)));
+            String.format(
+                "There are %s regions missing required roles and configured with limited access.",
+                numRegions)));
       } else if (cPStats.getReliableRegionsMissingNoAccess() > 0) {
         // health is poor
         int numRegions = cPStats.getReliableRegionsMissingNoAccess();
         status.add(poorHealth(
-            LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_AND_CONFIGURED_WITHOUT_ACCESS
-                .toLocalizedString(numRegions)));
+            String.format(
+                "There are %s regions missing required roles and configured without access.",
+                numRegions)));
       }
     } catch (CancelException ignore) {
     }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
index ed3dade..017f7ba 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
@@ -23,7 +23,6 @@ import org.apache.geode.admin.SystemMember;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.admin.Stat;
 import org.apache.geode.internal.admin.StatResource;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Provides monitoring of a statistic resource.
@@ -112,8 +111,8 @@ public class StatisticResourceImpl implements org.apache.geode.admin.StatisticRe
     }
     if (stats == null || stats.length < 1) {
       throw new AdminException(
-          LocalizedStrings.StatisticResourceImpl_FAILED_TO_REFRESH_STATISTICS_0_FOR_1
-              .toLocalizedString(getType() + "-" + getName(), getOwner()));
+          String.format("Failed to refresh statistics %s for %s",
+              getType() + "-" + getName(), getOwner()));
     }
 
     if (this.statistics == null || this.statistics.length < 1) {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
index 99af89f..dbfbb3d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
@@ -24,7 +24,6 @@ import org.apache.geode.cache.server.ServerLoadProbe;
 import org.apache.geode.internal.admin.AdminBridgeServer;
 import org.apache.geode.internal.admin.CacheInfo;
 import org.apache.geode.internal.admin.GemFireVM;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Implementation of an object used for managing cache servers.
@@ -66,8 +65,7 @@ public class SystemMemberBridgeServerImpl
   private void checkRunning() throws AdminException {
     if (this.isRunning()) {
       throw new AdminException(
-          LocalizedStrings.SystemMemberBridgeServerImpl_CANNOT_CHANGE_THE_CONFIGURATION_OF_A_RUNNING_BRIDGE_SERVER
-              .toLocalizedString());
+          "Cannot change the configuration of a running bridge server.");
     }
   }
 
@@ -105,8 +103,7 @@ public class SystemMemberBridgeServerImpl
 
     } catch (AdminException ex) {
       throw new InternalGemFireException(
-          LocalizedStrings.SystemMemberBridgeServerImpl_UNEXPECTED_EXCEPTION_WHILE_REFRESHING
-              .toLocalizedString(),
+          "Unexpected exception while refreshing",
           ex);
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
index 1ccb48a..ea2b69a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
@@ -38,7 +38,6 @@ import org.apache.geode.internal.admin.CacheInfo;
 import org.apache.geode.internal.admin.GemFireVM;
 import org.apache.geode.internal.admin.Stat;
 import org.apache.geode.internal.admin.StatResource;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * View of a GemFire system member's cache.
@@ -59,8 +58,8 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
     this.info = vm.getCacheInfo();
     if (this.info == null) {
       throw new CacheDoesNotExistException(
-          LocalizedStrings.SystemMemberCacheImpl_THE_VM_0_DOES_NOT_CURRENTLY_HAVE_A_CACHE
-              .toLocalizedString(vm.getId()));
+          String.format("The VM  %s  does not currently have a cache.",
+              vm.getId()));
     }
     initStats();
   }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
index 0341c9a..f8a7059 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
@@ -44,7 +44,6 @@ import org.apache.geode.internal.Config;
 import org.apache.geode.internal.ConfigSource;
 import org.apache.geode.internal.admin.GemFireVM;
 import org.apache.geode.internal.admin.StatResource;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -184,8 +183,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
     }
 
     if (childTail == null && mainTail == null) {
-      return LocalizedStrings.SystemMemberImpl_NO_LOG_FILE_CONFIGURED_LOG_MESSAGES_WILL_BE_DIRECTED_TO_STDOUT
-          .toLocalizedString();
+      return "No log file configured, log messages will be directed to stdout.";
     } else {
       StringBuffer result = new StringBuffer();
       if (mainTail != null) {
@@ -193,7 +191,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
       }
       if (childTail != null) {
         result.append(
-            "\n" + LocalizedStrings.SystemMemberImpl_TAIL_OF_CHILD_LOG.toLocalizedString() + "\n");
+            "\n" + "-------------------- tail of child log --------------------" + "\n");
         result.append(childTail);
       }
       return result.toString();
@@ -270,15 +268,15 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
   public void refreshConfig(Config config) throws org.apache.geode.admin.AdminException {
     if (config == null) {
       throw new AdminException(
-          LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0
-              .toLocalizedString(new Object[] {getId()}));
+          String.format("Failed to refresh configuration parameters for: %s",
+              new Object[] {getId()}));
     }
 
     String[] names = config.getAttributeNames();
     if (names == null || names.length < 1) {
       throw new AdminException(
-          LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0
-              .toLocalizedString(new Object[] {getId()}));
+          String.format("Failed to refresh configuration parameters for: %s",
+              new Object[] {getId()}));
     }
 
     for (int i = 0; i < names.length; i++) {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
index 403dd14..a48e5ff 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
@@ -88,10 +88,8 @@ import org.apache.geode.internal.admin.GfManagerAgent;
 import org.apache.geode.internal.admin.StatAlert;
 import org.apache.geode.internal.admin.StatAlertDefinition;
 import org.apache.geode.internal.admin.remote.UpdateAlertDefinitionMessage;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.InternalLogWriter;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Provides MBean support for managing a GemFire distributed system.
@@ -301,8 +299,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
       throws org.apache.geode.admin.AdminException {
     if (system == null) {
       throw new IllegalStateException(
-          LocalizedStrings.AdminDistributedSystemJmxImpl_GFMANAGERAGENT_MUST_NOT_BE_NULL
-              .toLocalizedString());
+          "GfManagerAgent must not be null");
     }
     return new GemFireHealthJmxImpl(system, this);
   }
@@ -387,10 +384,10 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
 
         if (isEmailNotificationEnabled) {
           String mess =
-              LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_JOINED_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0
-                  .toLocalizedString(new Object[] {joined.getId().toString()});
+              String.format("Member joined the Distributed SystemMember Id: %s",
+                  joined.getId().toString());
           sendEmail(EML_SUBJ_PRFX_GFE_NOTFY + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
-              + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_JOINED.toLocalizedString()
+              + "Member Joined"
               + ">", mess);
         }
       } catch (javax.management.MBeanException e) {
@@ -442,10 +439,10 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
 
         if (isEmailNotificationEnabled) {
           String mess =
-              LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_LEFT_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0
-                  .toLocalizedString(new Object[] {left.getId().toString()});
+              String.format("Member left the Distributed SystemMember Id: %s",
+                  left.getId().toString());
           sendEmail(EML_SUBJ_PRFX_GFE_NOTFY + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
-              + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_LEFT.toLocalizedString()
+              + "Member Left"
               + ">", mess);
         }
       } catch (javax.management.MBeanException e) {
@@ -504,10 +501,10 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
 
         if (isEmailNotificationEnabled) {
           String mess =
-              LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_CRASHED_IN_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0
-                  .toLocalizedString(new Object[] {crashed.getId().toString()});
+              String.format("Member crashed in the Distributed SystemMember Id: %s",
+                  crashed.getId().toString());
           sendEmail(EML_SUBJ_PRFX_GFE_ALERT + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
-              + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_CRASHED.toLocalizedString()
+              + "Member Crashed"
               + ">", mess);
         }
       } catch (javax.management.MBeanException e) {
@@ -559,8 +556,8 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
 
         if (isEmailNotificationEnabled) {
           String mess =
-              LocalizedStrings.AdminDistributedSystemJmxImpl_SYSTEM_ALERT_FROM_DISTRIBUTED_SYSTEM_0
-                  .toLocalizedString(strAlert);
+              String.format("System Alert from Distributed System: %s",
+                  strAlert);
           sendEmail(EML_SUBJ_PRFX_GFE_ALERT + EML_SUBJ_ITEM_GFE_DS + getName() + " <System Alert>",
               mess);
         }
@@ -1071,7 +1068,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
 
     if (isRmiClientCountZero) {
       logger.info(
-          LocalizedStrings.AdminDistributedSystemJmxImpl_JMX_CLIENT_COUNT_HAS_DROPPED_TO_ZERO);
+          "JMX Client count has dropped to zero.");
     }
   }
 
@@ -1298,56 +1295,56 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
   }
 
   public CacheServerConfig[] getCacheServerConfigs() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public CacheServerConfig createCacheServerConfig() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public void removeCacheServerConfig(CacheServerConfig config) {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public CacheVmConfig[] getCacheVmConfigs() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public CacheVmConfig createCacheVmConfig() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public void removeCacheVmConfig(CacheVmConfig config) {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public DistributionLocatorConfig[] getDistributionLocatorConfigs() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public DistributionLocatorConfig createDistributionLocatorConfig() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public void removeDistributionLocatorConfig(DistributionLocatorConfig config) {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public void addListener(ConfigListener listener) {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public void removeListener(ConfigListener listener) {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public void validate() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   @Override
   public Object clone() throws CloneNotSupportedException {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
 
@@ -1475,14 +1472,16 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
       ooStr = new DataInputStream(foStr);
       defns = (StatAlertDefinition[]) DataSerializer.readObjectArray(ooStr);
     } catch (ClassNotFoundException cnfEx) {
-      logger.error(LocalizedMessage.create(
-          LocalizedStrings.AdminDistributedSystem_ENCOUNTERED_A_0_WHILE_LOADING_STATALERTDEFINITIONS_1,
-          new Object[] {cnfEx.getClass().getName(), statAlertDefnSerFile}), cnfEx);
+      logger.error(String.format(
+          "Encountered a %s while loading StatAlertDefinitions [from %s]. This could be due to GemFire version mismatch. Loading of statAlertDefinitions has been aborted.",
+          new Object[] {cnfEx.getClass().getName(), statAlertDefnSerFile}),
+          cnfEx);
       canPersistStatAlertDefs = false;
     } catch (IOException ex) {
-      logger.error(LocalizedMessage.create(
-          LocalizedStrings.AdminDistributedSystem_ENCOUNTERED_A_0_WHILE_LOADING_STATALERTDEFINITIONS_1_LOADING_ABORTED,
-          new Object[] {ex.getClass().getName(), statAlertDefnSerFile}), ex);
+      logger.error(String.format(
+          "Encountered a %s while loading StatAlertDefinitions [from %s]. Loading of statAlertDefinitions has been aborted.",
+          new Object[] {ex.getClass().getName(), statAlertDefnSerFile}),
+          ex);
       canPersistStatAlertDefs = false;
     } finally {
       if (foStr != null) {
@@ -1548,9 +1547,10 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
 
       DataSerializer.writeObjectArray(defs, ooStr);
     } catch (IOException ex) {
-      logger.error(LocalizedMessage.create(
-          LocalizedStrings.AdminDistributedSystem_ENCOUNTERED_A_0_WHILE_SAVING_STATALERTDEFINITIONS_1,
-          new Object[] {ex.getClass().getName(), statAlertDefnSerFile}), ex);
+      logger.error(String.format(
+          "Encountered a %s while saving StatAlertDefinitions [from %s]. This could be due to GemFire version mismatch. Saving of statAlertDefinitions has been aborted.",
+          new Object[] {ex.getClass().getName(), statAlertDefnSerFile}),
+          ex);
     } finally {
       if (foStr != null)
         try {
@@ -1584,18 +1584,18 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
     // necessary.
     if (file.exists()) {
       if (!file.canWrite()) {
-        logger.warn(LocalizedMessage.create(
-            LocalizedStrings.AdminDistributedSystemJmxImpl_READONLY_STAT_ALERT_DEF_FILE_0,
-            new Object[] {file}));
+        logger.warn("stat-alert definitions could not be saved in the read-only file {}.",
+            new Object[] {file});
         fileIsWritable = false;
       }
     } else {
       try {
         file.createNewFile();
       } catch (IOException e) {
-        logger.warn(LocalizedMessage.create(
-            LocalizedStrings.AdminDistributedSystemJmxImpl_FAILED_TO_CREATE_STAT_ALERT_DEF_FILE_0,
-            new Object[] {file}), e);
+        logger.warn(String.format(
+            "Could not create file %s to save stat-alert definitions. stat-alert definitions could not be saved",
+            new Object[] {file}),
+            e);
         fileIsWritable = false;
       } finally {
         // Since we had created this file only for testing purpose, delete the
@@ -1975,9 +1975,9 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
       str.flush();
       arr = byteArrStr.toByteArray();
     } catch (IOException ex) {
-      logger.warn(LocalizedMessage.create(
-          LocalizedStrings.AdminDistributedSystem_ENCOUNTERED_AN_IOEXCEPTION_0,
-          ex.getLocalizedMessage()));
+      logger.warn(
+          "Encountered an IOException while serializing notifications, objects were not sent to the jmx clients as a result. {}",
+          ex.getLocalizedMessage());
     }
 
     return arr;
@@ -2011,11 +2011,10 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
       }
       if (isEmailNotificationEnabled) {
         String mess =
-            LocalizedStrings.AdminDistributedSystemJmxImpl_STATISTICS_ALERT_FROM_DISTRIBUTED_SYSTEM_MEMBER_0_STATISTICS_1
-                .toLocalizedString(new Object[] {objName.getCanonicalName(), buf.toString()});
+            String.format("Statistics Alert from Distributed SystemMember: %sStatistics: %s",
+                objName.getCanonicalName(), buf.toString());
         sendEmail(EML_SUBJ_PRFX_GFE_ALERT + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
-            + LocalizedStrings.AdminDistributedSystemJmxImpl_STATISTICS_ALERT_FOR_MEMBER
-                .toLocalizedString()
+            + "Statistics Alert for member"
             + ">", mess);
       }
     } catch (javax.management.MBeanException e) {
@@ -2077,10 +2076,10 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
   @Override
   public void processClientMembership(String senderId, String clientId, String clientHost,
       int eventType) {
-    logger.info(LocalizedMessage.create(
-        LocalizedStrings.AdminDistributedSystemJmxImpl_PROCESSING_CLIENT_MEMBERSHIP_EVENT_0_FROM_1_FOR_2_RUNNING_ON_3,
-        new String[] {ClientMembershipMessage.getEventTypeString(eventType), senderId, clientId,
-            clientHost}));
+    logger.info(
+        "Processing client membership event {} from {} for client with id: {} running on host: {}",
+        ClientMembershipMessage.getEventTypeString(eventType), senderId, clientId,
+        clientHost);
     try {
       SystemMemberJmx systemMemberJmx = null;
       CacheVm[] cacheVms = getCacheVms();
@@ -2108,9 +2107,9 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
         systemMemberJmx.handleClientMembership(clientId, eventType);
       }
     } catch (AdminException e) {
-      logger.error(LocalizedMessage.create(
-          LocalizedStrings.AdminDistributedSystemJmxImpl_FAILED_TO_PROCESS_CLIENT_MEMBERSHIP_FROM_0_FOR_1,
-          new Object[] {senderId, clientId}), e);
+      logger.error(String.format(
+          "Could not process client membership notification from %s for client with id %s.",
+          senderId, clientId), e);
       return;
     } catch (RuntimeOperationsException e) {
       logger.warn(e.getMessage(), e);// failed to send notification
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
index 0574e99..da41066 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
@@ -49,7 +49,6 @@ import org.apache.geode.admin.internal.InetAddressUtil;
 import org.apache.geode.admin.jmx.Agent;
 import org.apache.geode.admin.jmx.AgentConfig;
 import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.util.IOUtils;
 
 /**
@@ -493,12 +492,12 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
         in.close();
       } catch (java.io.IOException e) {
         throw new GemFireIOException(
-            LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(propFile), e);
+            String.format("Failed reading %s", propFile), e);
       }
     } else {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_SPECIFIED_PROPERTIES_FILE_DOES_NOT_EXIST_0
-              .toLocalizedString(propFile));
+          String.format("Specified properties file does not exist:  %s",
+              propFile));
     }
 
     initialize(props);
@@ -523,8 +522,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
   protected void checkReadOnly() {
     if (this.agent != null) {
       throw new IllegalStateException(
-          LocalizedStrings.AgentConfigImpl_AN_AGENTCONFIG_OBJECT_CANNOT_BE_MODIFIED_AFTER_IT_HAS_BEEN_USED_TO_CREATE_AN_AGENT
-              .toLocalizedString());
+          "An AgentConfig object cannot be modified after it has been used to create an Agent.");
     }
 
     super.checkReadOnly();
@@ -544,11 +542,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
      * information.
      */
     if (this.url == null) {
-      return LocalizedStrings.AgentConfigImpl_USING_DEFAULT_CONFIGURATION_BECAUSE_PROPERTY_FILE_WAS_FOUND
-          .toLocalizedString();
+      return "Using default configuration because property file was not found.";
     } else {
-      return LocalizedStrings.AgentConfigImpl_CONFIGURATION_LOADED_FROM_0
-          .toLocalizedString(this.url);
+      return String.format("Configuration loaded from: %s.",
+          this.url);
     }
   }
 
@@ -579,7 +576,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
 
     StringWriter sw = new StringWriter();
     PrintWriter pw = new PrintWriter(sw);
-    pw.println(LocalizedStrings.AgentConfigImpl_AGENT_CONFIGURATION.toLocalizedString());
+    pw.println("Agent Configuration:");
     Enumeration e = p.propertyNames();
     while (e.hasMoreElements()) {
       String pn = (String) e.nextElement();
@@ -1145,7 +1142,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
         }
       } catch (IOException e) {
         throw new GemFireIOException(
-            LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(url.toString()), e);
+            String.format("Failed reading %s", url.toString()), e);
       } finally {
         IOUtils.close(in);
       }
@@ -1173,62 +1170,46 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
    */
   public static String getPropertyDescription(String prop) {
     if (prop.equals(LOG_FILE_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_NAME_OF_THE_AGENTS_LOG_FILE.toLocalizedString();
+      return "Name of the agent's log file";
     } else if (prop.equals(LOG_LEVEL_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_MINIMUM_LEVEL_OF_LOGGING_PERFORMED_BY_AGENT
-          .toLocalizedString();
+      return "Minimum level of logging performed by agent. Valid values are: all, finest, finer, fine, config, info, warning, error, severe and none.";
     } else if (prop.equals(AGENT_DEBUG)) {
-      return LocalizedStrings.AgentConfigImpl_WHETHER_THE_AGENT_SHOULD_PRINT_DEBUGGING_INFORMATION
-          .toLocalizedString();
+      return "Whether the agent should print debugging information";
     } else if (prop.equals(LOG_DISK_SPACE_LIMIT_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_MUCH_DISK_SPACE_CAN_BE_CONSUMED_BY_OLD_INACTIVE_LOG_FILES
-          .toLocalizedString();
+      return "Limit, in megabytes, of how much disk space can be consumed by old inactive log files. This value (in megabytes) should be in the range: 0-1000000.";
     } else if (prop.equals(LOG_FILE_SIZE_LIMIT_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_LARGE_THE_CURRENT_STATISTIC_ARCHIVE_FILE_CAN_GROW_BEFORE_IT_IS_CLOSED_AND_ARCHIVAL_ROLLS_ON_TO_A_NEW_FILE
-          .toLocalizedString();
+      return "Limit, in megabytes, of how large the current log file can grow before it is closed and log rolls on to a new file. This value (in megabytes) should be in the range: 0-1000000.";
     } else if (prop.equals(MCAST_PORT)) {
-      return LocalizedStrings.AgentConfigImpl_MULTICAST_PORT_USED_TO_CONNECT_TO_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "Multicast port used to connect to distributed system. To use IP multicast, you must also define mcast-address. The value must be in the range: 0-65535.";
     } else if (prop.equals(MCAST_ADDRESS)) {
-      return LocalizedStrings.AgentConfigImpl_MULTICAST_ADDRESS_USED_TO_CONNECT_TO_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "Multicast address used to connect to distributed system. To use multicast, you must also define mcast-port, the IP port.";
     } else if (prop.equals(BIND_ADDRESS)) {
-      return LocalizedStrings.AgentConfigImpl_IP_ADDRESS_OF_THE_AGENTS_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "An IP address of the JMX Agent's distributed system on a multi-homed host. On a multi-homed host, you must explicitly specify the bind address.";
     } else if (prop.equals(TCP_PORT)) {
-      return LocalizedStrings.AgentConfigImpl_TCP_PORT.toLocalizedString();
+      return "TCP/IP port number to use in the agent's distributed system";
     } else if (prop.equals(LOCATORS)) {
-      return LocalizedStrings.AgentConfigImpl_ADDRESSES_OF_THE_LOCATORS_OF_THE_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "A comma-separated list of address(es) of the locator(s) in the distributed system in host[port] form. E.g. locators=host1[port1],host2[port2],...,hostn[portn]";
     } else if (prop.equals(MEMBERSHIP_PORT_RANGE_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_ALLOWED_RANGE_OF_UDP_PORTS_TO_FORM_UNIQUE_MEMBERSHIP_ID
-          .toLocalizedString();
+      return "The allowed range of UDP ports for use in forming an unique membership identifier. This range is given as two numbers separated by a minus sign.";
     } else if (prop.equals(ENTITY_CONFIG_XML_FILE_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_XML_CONFIGURATION_FILE_FOR_MANAGED_ENTITIES
-          .toLocalizedString();
+      return "The name of an XML file that specifies the configuration for the managed entity administered by the Distributed System. The XML file must conform to the dtd - doc-files/ds5_0.dtd.";
     } else if (prop.equals(REFRESH_INTERVAL_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_REFRESH_INTERVAL_IN_SECONDS_FOR_AUTOREFRESH_OF_MEMBERS_AND_STATISTIC_RESOURCES
-          .toLocalizedString();
+      return "Refresh Interval, in seconds, to be used for auto-refresh of SystemMember, StatisticResource and CacheServer refreshes";
     } else if (prop.equals(REMOTE_COMMAND_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_FOR_LAUNCHING_MEMBERS_OF_THE_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "Command prefix used for launching members of the distributed system";
     } else if (prop.equals(CLUSTER_SSL_ENABLED)) {
-      return LocalizedStrings.AgentConfigImpl_DOES_THE_DISTRIBUTED_SYSTEM_COMMUNICATE_USING_SSL
-          .toLocalizedString();
+      return "Whether to use the SSL protocol for communication between members of the admin distributed system. If set to true, locators should be used.";
     } else if (prop.equals(CLUSTER_SSL_PROTOCOLS)) {
-      return LocalizedStrings.AgentConfigImpl_SSL_PROTOCOLS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "A space-separated list of the SSL protocols used to communicate with distributed system.";
     } else if (prop.equals(CLUSTER_SSL_CIPHERS)) {
-      return LocalizedStrings.AgentConfigImpl_SSL_CIPHERS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "A space-separated list of the SSL ciphers to be used to communicate with distributed system.";
     } else if (prop.equals(CLUSTER_SSL_REQUIRE_AUTHENTICATION)) {
-      return LocalizedStrings.AgentConfigImpl_DOES_CONNECTING_TO_THE_DISTRIBUTED_SYSTEM_REQUIRE_SSL_AUTHENTICATION
-          .toLocalizedString();
+      return "Whether connection to the distributed system needs SSL authentication.";
     } else {
       String description = _getPropertyDescription(prop);
       if (description == null) {
         throw new IllegalArgumentException(
-            LocalizedStrings.AgentConfigImpl_UNKNOWN_CONFIG_PROPERTY_0.toLocalizedString(prop));
+            String.format("Unknown config property:  %s", prop));
 
       } else {
         return description;
@@ -1242,134 +1223,102 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
    */
   public static String _getPropertyDescription(String prop) {
     if (prop.equals(AUTO_CONNECT_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_AUTOMATICALLY_CONNECT_TO_THE_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "Whether the JMX agent will connect 'automatically' to the distributed system that it is configured to monitor.";
     } else if (prop.equals(HTTP_ENABLED_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_HTTP_JMX_ADAPTER
-          .toLocalizedString();
+      return "Whether the HTTP adapter is enabled in the JMX agent.";
 
     } else if (prop.equals(HTTP_BIND_ADDRESS_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_HTTP_ADAPTERS_SOCKETS
-          .toLocalizedString();
+      return "Bind address of HTTP adapter's sockets";
 
     } else if (prop.equals(HTTP_PORT_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_THE_PORT_ON_WHICH_THE_HTTP_ADAPTER_WILL_BE_STARTED
-          .toLocalizedString();
+      return "The port on which the HTTP adapter will be started. This value should be in the range: 0-65535.";
 
     } else if (prop.equals(RMI_ENABLED_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_RMI_JMX_ADAPTER
-          .toLocalizedString();
+      return "Whether the RMI JMX adapter is enabled.";
 
     } else if (prop.equals(RMI_REGISTRY_ENABLED_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_HOST_AN_RMI_REGISTRY
-          .toLocalizedString();
+      return "Whether the JMX agent should start RMI registry. Alternatively, a registry outside of the JMX agent VM can be used.";
 
     } else if (prop.equals(RMI_BIND_ADDRESS_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_RMI_ADAPTERS_SOCKETS
-          .toLocalizedString();
+      return "Bind address of RMI adapter's sockets";
 
     } else if (prop.equals(RMI_PORT_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_THE_PORT_ON_WHICH_TO_CONTACT_THE_RMI_REGISTER
-          .toLocalizedString();
+      return "The port on which to contact the RMI registry. The value must be in the range: 0-65535.";
 
     } else if (prop.equals(RMI_SERVER_PORT_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_THE_PORT_USED_TO_CONFIGURE_RMI_CONNECTOR_SERVER
-          .toLocalizedString();
+      return "The port on which the RMI Connector Server should start. The value must be in the range: 0-65535.";
 
     } else if (prop.equals(SNMP_ENABLED_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_SNMP_JMX_ADAPTER
-          .toLocalizedString();
+      return "Whether the SNMP JMX adapter will be enabled.";
 
     } else if (prop.equals(SNMP_BIND_ADDRESS_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_SNMP_ADAPTERS_SOCKETS
-          .toLocalizedString();
+      return "Bind address of SNMP adapter's sockets";
 
     } else if (prop.equals(SNMP_DIRECTORY_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_THE_DIRECTORY_IN_WHICH_SNMP_CONFIGURATION_RESIDES
-          .toLocalizedString();
+      return "The directory in which SNMP configuration resides";
 
     } else if (prop.equals(AGENT_SSL_ENABLED_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_COMMUNICATE_USING_SSL
-          .toLocalizedString();
+      return "Whether the JMX Agent will use the SSL protocol for communication.";
 
     } else if (prop.equals(AGENT_SSL_PROTOCOLS_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_THE_SSL_PROTOCOLS_USED_BY_THE_AGENT
-          .toLocalizedString();
+      return "The space-separated list of the SSL protocols to be used when connecting to the JMX agent.";
 
     } else if (prop.equals(AGENT_SSL_CIPHERS_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_THE_SSL_CIPHERS_USED_BY_THE_AGENT.toLocalizedString();
+      return "The space-separated list of the SSL ciphers to be used when connecting to the JMX Agent.";
 
     } else if (prop.equals(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_REQUIRE_SSL_AUTHENTICATION
-          .toLocalizedString();
+      return "Whether or not SSL connections to the RMI adapter require authentication. If true, needs client authentication for RMI and other non-HTTP connectors/adaptors.";
 
     } else if (prop.equals(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_HTTP_ADAPTER_REQUIRE_SSL_AUTHENTICATION
-          .toLocalizedString();
+      return "Whether SSL connections to the HTTP adapter will need authentication.";
 
     } else if (prop.equals(HTTP_AUTHENTICATION_ENABLED_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_WILL_THE_HTTP_JMX_ADAPTER_USE_HTTP_AUTHENTICATION
-          .toLocalizedString();
+      return "Whether the HTTP adapter will use HTTP authentication.";
 
     } else if (prop.equals(HTTP_AUTHENTICATION_USER_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_THE_USER_NAME_FOR_AUTHENTICATION_IN_THE_HTTP_JMX_ADAPTER
-          .toLocalizedString();
+      return "The user name for authentication in the HTTP JMX adapter";
 
     } else if (prop.equals(HTTP_AUTHENTICATION_PASSWORD_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_THE_PASSWORD_FOR_AUTHENTICATION_IN_THE_HTTP_JMX_ADAPTER
-          .toLocalizedString();
+      return "The password for authentication in the HTTP JMX adapter";
 
     } else if (prop.equals(PROPERTY_FILE_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_PROPERTY_FILE_FROM_WHICH_AGENT_READS_CONFIGURATION
-          .toLocalizedString();
+      return "Name and path of the Agent's properties file from which agent reads configuration";
 
     } else if (prop.equals(LOCATOR_HOST_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_HOST_ON_WHICH_THE_DISTRIBUTED_SYSTEMS_LOCATOR_RUNS
-          .toLocalizedString();
+      return "Host on which the distributed system's locator runs";
 
     } else if (prop.equals(LOCATOR_PORT_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_HOST_ON_WHICH_THE_DISTRIBUTED_SYSTEMS_LOCATOR_RUNS
-          .toLocalizedString();
+      return "Host on which the distributed system's locator runs";
 
     } else if (prop.equals(LOCATOR_PRODUCT_DIRECTORY_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_GEMFIRE_PRODUCT_DIRECTORY_USED_TO_LAUNCH_A_LOCATOR
-          .toLocalizedString();
+      return "GemFire product directory used to launch a locator";
 
     } else if (prop.equals(LOCATOR_WORKING_DIRECTORY_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_DIRECTORY_IN_WHICH_A_LOCATOR_WILL_BE_LAUNCHED
-          .toLocalizedString();
+      return "Directory in which a locator will be launched";
 
     } else if (prop.equals(LOCATOR_REMOTE_COMMAND)) {
-      return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_WHEN_LAUNCHING_A_LOCATOR
-          .toLocalizedString();
+      return "Command prefix used when launching a locator";
 
     } else if (prop.equals(LOCATOR_BIND_ADDRESS)) {
-      return LocalizedStrings.AgentConfigImpl_IP_ADDRESS_TO_USE_WHEN_CONTACTING_LOCATOR
-          .toLocalizedString();
+      return "IP address to use when contacting locator";
 
     } else if (prop.equals(LOCATOR_DS_PROPERTIES)) {
-      return LocalizedStrings.AgentConfigImpl_PROPERTIES_FOR_CONFIGURING_A_LOCATORS_DISTRIBUTED_SYSTEM
-          .toLocalizedString();
+      return "Properties for configuring a locator's distributed system";
 
     } else if (prop.equals(EMAIL_NOTIFICATIONS_ENABLED_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_IDENTIFY_IF_EMAIL_NOTIFICATIONS_ARE_ENABLED_OR_NOT
-          .toLocalizedString();
+      return "Whether the e-mail notifications are enabled.";
 
     } else if (prop.equals(EMAIL_NOTIFICATIONS_FROM_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_EMAIL_ADDRESS_USING_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT
-          .toLocalizedString();
+      return "E-mail address to be used to send e-mail notifications.";
 
     } else if (prop.equals(EMAIL_NOTIFICATIONS_HOST_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_EMAIL_SERVER_HOST_USING_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT
-          .toLocalizedString();
+      return "The host name of the e-mail server to be used for sending email notification.";
 
     } else if (prop.equals(EMAIL_NOTIFICATIONS_TO_LIST_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_COMMA_SEPARATED_EMAIL_ADDRESSES_LIST_TO_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT
-          .toLocalizedString();
+      return "A comma-separated list of recipient e-mail addresses to send e-mail notifications to.";
 
     } else if (prop.equals(STATE_SAVE_FILE_NAME)) {
-      return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_NAME_OF_THE_FILE_TO_BE_USED_FOR_SAVING_AGENT_STATE
-          .toLocalizedString();
+      return "The name(not the path) of the file to be used for saving agent state. The file is stored in the same directory in which the agent.properties file is located.";
 
     } else {
       return null;
@@ -1432,22 +1381,22 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
 
     if (this.httpPort < 0 || this.httpPort > MAX_HTTP_PORT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
-              .toLocalizedString(new Object[] {HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT),
+          String.format("%s must be zero or an integer between %s and %s.",
+              new Object[] {HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT),
                   Integer.valueOf(MAX_HTTP_PORT)}));
     }
 
     if (this.rmiPort < 0 || this.rmiPort > MAX_RMI_PORT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
-              .toLocalizedString(new Object[] {RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
+          String.format("%s must be zero or an integer between %s and %s.",
+              new Object[] {RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
                   Integer.valueOf(MAX_RMI_PORT)}));
     }
 
     if (this.rmiServerPort < 0 || this.rmiServerPort > MAX_RMI_PORT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
-              .toLocalizedString(new Object[] {RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
+          String.format("%s must be zero or an integer between %s and %s.",
+              new Object[] {RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
                   Integer.valueOf(MAX_RMI_PORT)}));
     }
 
@@ -1509,8 +1458,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
   private int validateHttpPort(int val) {
     if (val < 0 || val > MAX_HTTP_PORT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
-              .toLocalizedString(new Object[] {HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT),
+          String.format("%s must be zero or an integer between %s and %s.",
+              new Object[] {HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT),
                   Integer.valueOf(MAX_HTTP_PORT)}));
     }
     return val;
@@ -1535,7 +1484,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
   private String validateHttpBindAddress(InetAddress val) {
     if (val == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_HTTPBINDADDRESS_MUST_NOT_BE_NULL.toLocalizedString());
+          "HttpBindAddress must not be null");
     }
     return toString("", val);
   }
@@ -1584,8 +1533,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
   private int validateRmiPort(int val) {
     if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
-              .toLocalizedString(new Object[] {RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
+          String.format("%s must be zero or an integer between %s and %s.",
+              new Object[] {RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
                   Integer.valueOf(MAX_RMI_PORT)}));
     }
     return val;
@@ -1612,8 +1561,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
   private int validateRmiServerPort(int val) {
     if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
-              .toLocalizedString(new Object[] {RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
+          String.format("%s must be zero or an integer between %s and %s.",
+              new Object[] {RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
                   Integer.valueOf(MAX_RMI_PORT)}));
     }
     return val;
@@ -1638,8 +1587,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
   private File validateWorkingDirectory(String workingDir) {
     if (isEmpty(workingDir)) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentConfigImpl_LOCATOR_WORKINGDIRECTORY_MUST_NOT_BE_NULL
-              .toLocalizedString());
+          "Locator WorkingDirectory must not be null");
     }
     return new File(workingDir);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
index c7a2092..8fdc1f1 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
@@ -55,19 +55,16 @@ import org.apache.geode.admin.jmx.Agent;
 import org.apache.geode.admin.jmx.AgentConfig;
 import org.apache.geode.admin.jmx.AgentFactory;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
-import org.apache.geode.i18n.StringId;
 import org.apache.geode.internal.Banner;
 import org.apache.geode.internal.ExitCode;
 import org.apache.geode.internal.GemFireVersion;
 import org.apache.geode.internal.admin.remote.TailLogResponse;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.InternalLogWriter;
 import org.apache.geode.internal.logging.LogConfig;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LogWriterFactory;
 import org.apache.geode.internal.logging.LoggingThread;
 import org.apache.geode.internal.logging.log4j.AlertAppender;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.logging.log4j.LogWriterAppender;
 import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
@@ -189,7 +186,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
     addShutdownHook();
     if (agentConfig == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentImpl_AGENTCONFIG_MUST_NOT_BE_NULL.toLocalizedString());
+          "AgentConfig must not be null");
     }
     this.agentConfig = (AgentConfigImpl) agentConfig;
     this.mbeanName = MBEAN_NAME_PREFIX + MBeanUtil.makeCompliantMBeanNameProperty("Agent");
@@ -197,8 +194,8 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
     try {
       this.objectName = new ObjectName(this.mbeanName);
     } catch (MalformedObjectNameException ex) {
-      String s = LocalizedStrings.AgentImpl_WHILE_CREATING_OBJECTNAME_0
-          .toLocalizedString(new Object[] {this.mbeanName});
+      String s = String.format("While creating ObjectName:  %s",
+          new Object[] {this.mbeanName});
       throw new AdminException(s, ex);
     }
 
@@ -230,14 +227,11 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
        * some problem. Also not creating Localized String for the exception.
        */
     } catch (OperationsException e) {
-      logger.info(LocalizedMessage
-          .create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
+      logger.info("Failed to initialize MemberInfoWithStatsMBean.", e);
     } catch (MBeanRegistrationException e) {
-      logger.info(LocalizedMessage
-          .create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
+      logger.info("Failed to initialize MemberInfoWithStatsMBean.", e);
     } catch (AdminException e) {
-      logger.info(LocalizedMessage
-          .create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
+      logger.info("Failed to initialize MemberInfoWithStatsMBean.", e);
     }
   }
 
@@ -313,20 +307,20 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
          * stop all the HTTP/RMI/SNMP adapters started earlier.
          */
       } catch (AdminException ex) {
-        logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_AUTO_CONNECT_FAILED__0,
-            ex.getMessage()));
+        logger.error("auto connect failed:  {}",
+            ex.getMessage());
         this.stop();
         throw new StartupException(ex);
       } catch (MalformedObjectNameException ex) {
-        StringId autoConnectFailed = LocalizedStrings.AgentImpl_AUTO_CONNECT_FAILED__0;
-        logger.error(LocalizedMessage.create(autoConnectFailed, ex.getMessage()));
+        String autoConnectFailed = "auto connect failed:  {}";
+        logger.error(autoConnectFailed, ex.getMessage());
         this.stop();
         throw new StartupException(new AdminException(
-            autoConnectFailed.toLocalizedString(new Object[] {ex.getMessage()}), ex));
+            String.format("auto connect failed:  %s", ex.getMessage()), ex));
       }
     } // getAutoConnect
 
-    logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_GEMFIRE_JMX_AGENT_IS_RUNNING));
+    logger.info("GemFire JMX Agent is running...");
     LogWriterAppenders.startupComplete(LogWriterAppenders.Identifier.MAIN);
 
     if (memberInfoWithStatsMBean == null) {
@@ -339,7 +333,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
    */
   public void stop() {
     try {
-      logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_STOPPING_JMX_AGENT));
+      logger.info("Stopping JMX agent");
       AlertAppender.getInstance().shuttingDown();
       LogWriterAppenders.stop(LogWriterAppenders.Identifier.MAIN);
 
@@ -360,7 +354,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       // upon JVM shutdown
       removeShutdownHook();
 
-      logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_AGENT_HAS_STOPPED));
+      logger.info("Agent has stopped");
     } finally {
       LogWriterAppenders.destroy(LogWriterAppenders.Identifier.MAIN);
     }
@@ -489,8 +483,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
     String childTail = tailFile(this.logWriterAppender.getChildLogFile());
     String mainTail = tailFile(new File(this.agentConfig.getLogFile()));
     if (childTail == null && mainTail == null) {
-      return LocalizedStrings.AgentImpl_NO_LOG_FILE_CONFIGURED_LOG_MESSAGES_WILL_BE_DIRECTED_TO_STDOUT
-          .toLocalizedString();
+      return "No log file configured, log messages will be directed to stdout.";
     } else {
       StringBuffer result = new StringBuffer();
       if (mainTail != null) {
@@ -498,7 +491,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       }
       if (childTail != null) {
         result
-            .append("\n" + LocalizedStrings.AgentImpl_TAIL_OF_CHILD_LOG.toLocalizedString() + "\n");
+            .append("\n" + "-------------------- tail of child log --------------------" + "\n");
         result.append(childTail);
       }
       return result.toString();
@@ -546,13 +539,13 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
     File f = (new File(value)).getAbsoluteFile();
     if (f.isDirectory()) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AgentImpl_THE_FILE_0_IS_A_DIRECTORY.toLocalizedString(f));
+          String.format("The file  %s  is a directory.", f));
     }
     File parent = f.getParentFile();
     if (parent != null) {
       if (!parent.isDirectory()) {
         throw new IllegalArgumentException(
-            LocalizedStrings.AgentImpl_THE_DIRECTORY_0_DOES_NOT_EXIST.toLocalizedString(parent));
+            String.format("The directory  %s  does not exist.", parent));
       }
     }
     this.propertyFile = f.getPath();
@@ -810,8 +803,8 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
     try {
       return TailLogResponse.tailSystemLog(f);
     } catch (IOException ex) {
-      return LocalizedStrings.AgentImpl_COULD_NOT_TAIL_0_BECAUSE_1
-          .toLocalizedString(new Object[] {f, ex});
+      return String.format("Could not tail %s because: %s",
+          new Object[] {f, ex});
     }
   }
 
@@ -888,8 +881,8 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
 
     // LOG:CONFIG: changed next three statements from config to info
     logger.info(LogMarker.CONFIG_MARKER,
-        LocalizedStrings.AgentImpl_AGENT_CONFIG_PROPERTY_FILE_NAME_0
-            .toLocalizedString(AgentConfigImpl.retrievePropertyFile()));
+        String.format("Agent config property file name: %s",
+            AgentConfigImpl.retrievePropertyFile()));
     logger.info(LogMarker.CONFIG_MARKER, this.agentConfig.getPropertyFileDescription());
     logger.info(LogMarker.CONFIG_MARKER, this.agentConfig.toPropertiesAsString());
   }
@@ -1035,7 +1028,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       ac = new AgentConfigImpl(args);
     } catch (RuntimeException ex) {
       System.err
-          .println(LocalizedStrings.AgentImpl_FAILED_READING_CONFIGURATION_0.toLocalizedString(ex));
+          .println(String.format("Failed reading configuration: %s", ex));
       ExitCode.FATAL.doSystemExit();
       return;
     }
@@ -1087,8 +1080,8 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       }
       mbs.registerMBean(registryNamingService, registryName);
     } catch (javax.management.InstanceAlreadyExistsException e) {
-      logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_0__IS_ALREADY_REGISTERED,
-          registryName));
+      logger.info("{}  is already registered.",
+          registryName);
     }
     mbs.invoke(registryName, "start", null, null);
   }
@@ -1113,8 +1106,8 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
     if ((overrideHostName == null || overrideHostName.trim().length() == 0)
         && (rmiBindAddress != null && rmiBindAddress.trim().length() != 0)) {
       System.setProperty(rmiStubServerNameKey, rmiBindAddress);
-      logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_SETTING_0,
-          new StringBuilder(rmiStubServerNameKey).append(" = ").append(rmiBindAddress)));
+      logger.info((new StringBuilder("Setting ").append(rmiStubServerNameKey).append(" = ")
+          .append(rmiBindAddress).toString()));
     }
 
     try {
@@ -1124,8 +1117,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       // make sure this adaptor is not already registered...
       if (getMBeanServer().isRegistered(objName)) {
         // dunno how we got here...
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.AgentImpl_RMICONNECTORSERVER_ALREADY_REGISTERED_AS__0, objName));
+        logger.info("RMIConnectorServer already registered as {}", objName);
         return;
       }
 
@@ -1198,9 +1190,9 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       // error condition, so you also need to check to see if the JVM
       // is still usable:
       SystemFailure.checkFailure();
-      logger.error(LocalizedStrings.AgentImpl_FAILED_TO_START_RMICONNECTORSERVER, t);
+      logger.error("Failed to start RMIConnectorServer:", t);
       throw new StartupException(
-          LocalizedStrings.AgentImpl_FAILED_TO_START_RMI_SERVICE.toLocalizedString(), t);
+          "Failed to start RMI service, verify RMI configuration properties", t);
     }
   }
 
@@ -1218,8 +1210,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       // make sure this adaptor is not already registered...
       if (getMBeanServer().isRegistered(objName)) {
         // dunno how we got here...
-        logger.info(LocalizedMessage
-            .create(LocalizedStrings.AgentImpl_SNMPADAPTOR_ALREADY_REGISTERED_AS__0, objName));
+        logger.info("SnmpAdaptor already registered as  {}", objName);
         return;
       }
 
@@ -1230,13 +1221,12 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       // validate the directory...
       if (snmpDir == null || snmpDir.length() == 0) {
         throw new IllegalArgumentException(
-            LocalizedStrings.AgentImpl_SNMPDIRECTORY_MUST_BE_SPECIFIED_BECAUSE_SNMP_IS_ENABLED
-                .toLocalizedString());
+            "snmp-directory must be specified because SNMP is enabled");
       }
       File root = new File(snmpDir);
       if (!root.exists()) {
         throw new IllegalArgumentException(
-            LocalizedStrings.AgentImpl_SNMPDIRECTORY_DOES_NOT_EXIST.toLocalizedString());
+            "snmp-directory does not exist");
       }
 
       // create the adaptor...
@@ -1263,10 +1253,9 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       // error condition, so you also need to check to see if the JVM
       // is still usable:
       SystemFailure.checkFailure();
-      logger.error(LocalizedMessage
-          .create(LocalizedStrings.AgentImpl_FAILED_TO_START_SNMPADAPTOR__0, t.getMessage()));
-      throw new StartupException(LocalizedStrings.AgentImpl_FAILED_TO_START_SNMPADAPTOR__0
-          .toLocalizedString(t.getMessage()), t);
+      logger.error("Failed to start SnmpAdaptor:  {}", t.getMessage());
+      throw new StartupException(String.format("Failed to start SnmpAdaptor:  %s",
+          t.getMessage()), t);
     }
   }
 
@@ -1284,8 +1273,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       // make sure this adaptor is not already registered...
       if (getMBeanServer().isRegistered(objName)) {
         // dunno how we got here...
-        logger.info(LocalizedMessage
-            .create(LocalizedStrings.AgentImpl_HTTPADAPTOR_ALREADY_REGISTERED_AS__0, objName));
+        logger.info("HttpAdaptor already registered as  {}", objName);
         return;
       }
 
@@ -1295,20 +1283,19 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       if (this.agentConfig.getHttpPort() > 0) {
         this.httpAdaptor.setPort(this.agentConfig.getHttpPort());
         logger.info(LogMarker.CONFIG_MARKER,
-            LocalizedMessage.create(LocalizedStrings.AgentImpl_HTTP_ADAPTOR_LISTENING_ON_PORT__0,
-                this.agentConfig.getHttpPort()));
+            "HTTP adaptor listening on port: {}",
+            this.agentConfig.getHttpPort());
       } else {
-        logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_INCORRECT_PORT_VALUE__0,
-            this.agentConfig.getHttpPort()));
+        logger.error("Incorrect port value  {}",
+            this.agentConfig.getHttpPort());
       }
 
       if (this.agentConfig.getHttpBindAddress() != null) {
         String host = this.agentConfig.getHttpBindAddress();
-        logger.info(LogMarker.CONFIG_MARKER, LocalizedMessage
-            .create(LocalizedStrings.AgentImpl_HTTP_ADAPTOR_LISTENING_ON_ADDRESS__0, host));
+        logger.info(LogMarker.CONFIG_MARKER, "HTTP adaptor listening on address:  {}", host);
         this.httpAdaptor.setHost(host);
       } else {
-        logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_INCORRECT_NULL_HOSTNAME));
+        logger.error("Incorrect null hostname");
       }
 
       // SSL support...
@@ -1347,10 +1334,9 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
       // error condition, so you also need to check to see if the JVM
       // is still usable:
       SystemFailure.checkFailure();
-      logger.error(LocalizedMessage
-          .create(LocalizedStrings.AgentImpl_FAILED_TO_START_HTTPADAPTOR__0, t.getMessage()));
-      throw new StartupException(LocalizedStrings.AgentImpl_FAILED_TO_START_HTTPADAPTOR__0
-          .toLocalizedString(t.getMessage()), t);
+      logger.error("Failed to start HttpAdaptor:  {}", t.getMessage());
+      throw new StartupException(String.format("Failed to start HttpAdaptor:  %s",
+          t.getMessage()), t);
     }
   }
 
@@ -1363,8 +1349,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
     // make sure this mbean is not already registered...
     if (getMBeanServer().isRegistered(objName)) {
       // dunno how we got here...
-      logger.info(LocalizedMessage
-          .create(LocalizedStrings.AgentImpl_XSLTPROCESSOR_ALREADY_REGISTERED_AS__0, objName));
+      logger.info("XsltProcessor already registered as  {}", objName);
       return objName;
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
index 7301462..63396ff 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
@@ -48,7 +48,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.internal.ExitCode;
 import org.apache.geode.internal.OSProcess;
 import org.apache.geode.internal.PureJavaMode;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LoggingThread;
 import org.apache.geode.internal.net.SocketCreator;
@@ -136,7 +135,7 @@ public class AgentLauncher {
     Properties props = AgentConfigImpl.getDefaultValuesForAllProperties();
 
     out.println("\n");
-    out.println(LocalizedStrings.AgentLauncher_AGENT_CONFIGURATION_PROPERTIES.toString());
+    out.println("Agent configuration properties".toString());
 
     SortedMap<String, String> map = new TreeMap<String, String>();
 
@@ -150,7 +149,7 @@ public class AgentLauncher {
 
       map.put(prop,
           AgentConfigImpl.getPropertyDescription(prop) + " ("
-              + LocalizedStrings.AgentLauncher_DEFAULT.toLocalizedString() + "  \""
+              + "Default" + "  \""
               + props.getProperty(prop) + "\")");
     }
 
@@ -274,7 +273,7 @@ public class AgentLauncher {
 
     if (status != null && status.state != SHUTDOWN) {
       throw new IllegalStateException(
-          LocalizedStrings.AgentLauncher_JMX_AGENT_EXISTS_BUT_WAS_NOT_SHUTDOWN.toLocalizedString());
+          "JMX Agent exists but was not shutdown.");
     }
 
     deleteStatus();
@@ -315,8 +314,8 @@ public class AgentLauncher {
         .tryGetCanonicalFileElseGetAbsoluteFile(new File(workingDirectory, startLogFileName));
 
     if (startLogFile.exists() && !startLogFile.delete()) {
-      throw new IOException(LocalizedStrings.AgentLauncher_UNABLE_TO_DELETE_FILE_0
-          .toLocalizedString(startLogFile.getAbsolutePath()));
+      throw new IOException(String.format("Unable to delete file %s.",
+          startLogFile.getAbsolutePath()));
     }
 
     Map<String, String> env = new HashMap<String, String>();
@@ -328,7 +327,7 @@ public class AgentLauncher {
     final int pid = OSProcess.bgexec(commandLine, workingDirectory, startLogFile, false, env);
 
     System.out.println(
-        LocalizedStrings.AgentLauncher_STARTING_JMX_AGENT_WITH_PID_0.toLocalizedString(pid));
+        String.format("Starting JMX Agent with pid: %s", pid));
 
     return pid;
   }
@@ -351,7 +350,7 @@ public class AgentLauncher {
 
     if (status == null) {
       // TODO throw a more appropriate Exception here!
-      throw new Exception(LocalizedStrings.AgentLauncher_NO_AVAILABLE_STATUS.toLocalizedString());
+      throw new Exception("No available status.");
     } else {
       System.out.println(status);
     }
@@ -399,8 +398,8 @@ public class AgentLauncher {
       if (e instanceof VirtualMachineError) {
         SystemFailure.setFailure((VirtualMachineError) e);
       }
-      setServerError(LocalizedStrings.AgentLauncher_UNCAUGHT_EXCEPTION_IN_THREAD_0
-          .toLocalizedString(t.getName()), e);
+      setServerError(String.format("Uncaught exception in thread %s",
+          t.getName()), e);
     };
   }
 
@@ -425,8 +424,8 @@ public class AgentLauncher {
       }
 
       private void handleGemFireException(final GemFireException e) {
-        String message = LocalizedStrings.AgentLauncher_SERVER_FAILED_TO_START_0
-            .toLocalizedString(e.getMessage());
+        String message = String.format("Server failed to start: %s",
+            e.getMessage());
 
         if (e.getCause() != null) {
           if (e.getCause().getCause() != null) {
@@ -484,7 +483,7 @@ public class AgentLauncher {
         processDirOption(options, arg.substring("-dir=".length()));
       } else {
         throw new Exception(
-            LocalizedStrings.AgentLauncher_UNKNOWN_ARGUMENT_0.toLocalizedString(arg));
+            String.format("Unknown argument:  %s", arg));
       }
     }
 
@@ -512,18 +511,18 @@ public class AgentLauncher {
 
       if (isStatus(SHUTDOWN)) {
         System.out
-            .println(LocalizedStrings.AgentLauncher_0_HAS_STOPPED.toLocalizedString(this.basename));
+            .println(String.format("The %s has shut down.", this.basename));
         deleteStatus();
         exitCode = ExitCode.NORMAL;
       } else {
         System.out
-            .println(LocalizedStrings.AgentLauncher_TIMEOUT_WAITING_FOR_0_TO_SHUTDOWN_STATUS_IS_1
-                .toLocalizedString(this.basename, status));
+            .println(String.format("Timeout waiting for %s to shutdown, status is: %s",
+                this.basename, status));
       }
     } else {
       System.out.println(
-          LocalizedStrings.AgentLauncher_THE_SPECIFIED_WORKING_DIRECTORY_0_CONTAINS_NO_STATUS_FILE
-              .toLocalizedString(workingDirectory));
+          String.format("The specified working directory (%s) contains no status file",
+              workingDirectory));
     }
 
     exitCode.doSystemExit();
@@ -560,8 +559,8 @@ public class AgentLauncher {
       status = spinReadStatus();
     } else {
       status = createStatus(this.basename, SHUTDOWN, 0,
-          LocalizedStrings.AgentLauncher_0_IS_NOT_RUNNING_IN_SPECIFIED_WORKING_DIRECTORY_1
-              .toLocalizedString(this.basename, this.workingDirectory),
+          String.format("%s is not running in the specified working directory: (%s).",
+              this.basename, this.workingDirectory),
           null);
     }
 
@@ -754,8 +753,8 @@ public class AgentLauncher {
 
     if (!workingDirectory.exists()) {
       throw new FileNotFoundException(
-          LocalizedStrings.AgentLauncher_THE_INPUT_WORKING_DIRECTORY_DOES_NOT_EXIST_0
-              .toLocalizedString(dirValue));
+          String.format("The input working directory does not exist:  %s",
+              dirValue));
     }
 
     options.put(DIR, workingDirectory);
@@ -775,22 +774,22 @@ public class AgentLauncher {
     out.println("\n** " + message + "\n");
 
     out.println("agent start [-J<vmarg>]* [-dir=<dir>] [prop=value]*");
-    out.println(LocalizedStrings.AgentLauncher_STARTS_THE_GEMFIRE_JMX_AGENT.toLocalizedString());
-    out.println("\t" + LocalizedStrings.AgentLauncher_VMARG.toLocalizedString());
-    out.println("\t" + LocalizedStrings.AgentLauncher_DIR.toLocalizedString());
-    out.println("\t" + LocalizedStrings.AgentLauncher_PROP.toLocalizedString());
-    out.println("\t" + LocalizedStrings.AgentLauncher_SEE_HELP_CONFIG.toLocalizedString());
+    out.println("Starts the GemFire JMX Agent");
+    out.println("\t"
+        + "<vmarg> a VM-option passed to the agent's VM, example -J-Xmx1024M for a 1 Gb heap");
+    out.println("\t" + "<dir> Directory in which agent runs, default is the current directory");
+    out.println("\t" + "<prop> A configuration property/value passed to the agent");
+    out.println("\t" + "(see help config for more details)");
     out.println();
 
     out.println("agent stop [-dir=<dir>]");
-    out.println(LocalizedStrings.AgentLauncher_STOPS_A_GEMFIRE_JMX_AGENT.toLocalizedString());
-    out.println("\t" + LocalizedStrings.AgentLauncher_DIR.toLocalizedString());
+    out.println("Stops a GemFire JMX Agent");
+    out.println("\t" + "<dir> Directory in which agent runs, default is the current directory");
     out.println("");
     out.println("agent status [-dir=<dir>]");
     out.println(
-        LocalizedStrings.AgentLauncher_REPORTS_THE_STATUS_AND_THE_PROCESS_ID_OF_A_GEMFIRE_JMX_AGENT
-            .toLocalizedString());
-    out.println("\t" + LocalizedStrings.AgentLauncher_DIR.toLocalizedString());
+        "Reports the status and the process id of a GemFire JMX Agent");
+    out.println("\t" + "<dir> Directory in which agent runs, default is the current directory");
     out.println();
 
     ExitCode.FATAL.doSystemExit();
@@ -803,7 +802,7 @@ public class AgentLauncher {
    */
   public static void main(final String[] args) {
     if (args.length < 1) {
-      usage(LocalizedStrings.AgentLauncher_MISSING_COMMAND.toLocalizedString());
+      usage("Missing command");
     }
 
     // TODO is this only needed on 'agent server'? 'agent {start|stop|status}' technically do no run
@@ -831,13 +830,13 @@ public class AgentLauncher {
           if (topic.equals("config")) {
             launcher.configHelp();
           } else {
-            usage(LocalizedStrings.AgentLauncher_NO_HELP_AVAILABLE_FOR_0.toLocalizedString(topic));
+            usage(String.format("No help available for %s", topic));
           }
         }
 
-        usage(LocalizedStrings.AgentLauncher_AGENT_HELP.toLocalizedString());
+        usage("agent help");
       } else {
-        usage(LocalizedStrings.AgentLauncher_UNKNOWN_COMMAND_0.toLocalizedString(command));
+        usage(String.format("Unknown command: %s", command));
       }
     } catch (VirtualMachineError e) {
       SystemFailure.initiateFailure(e);
@@ -846,7 +845,7 @@ public class AgentLauncher {
       SystemFailure.checkFailure();
       t.printStackTrace();
       System.err.println(
-          LocalizedStrings.AgentLauncher_ERROR_0.toLocalizedString(t.getLocalizedMessage()));
+          String.format("Error : %s", t.getLocalizedMessage()));
       ExitCode.FATAL.doSystemExit();
     }
   }
@@ -889,27 +888,26 @@ public class AgentLauncher {
         buffer.append(msg);
       } else {
         buffer.append(
-            LocalizedStrings.AgentLauncher_0_PID_1_STATUS.toLocalizedString(this.baseName, pid));
+            String.format("%s pid: %d status: ", this.baseName, pid));
 
         switch (state) {
           case SHUTDOWN:
-            buffer.append(LocalizedStrings.AgentLauncher_SHUTDOWN.toLocalizedString());
+            buffer.append("shutdown");
             break;
           case STARTING:
-            buffer.append(LocalizedStrings.AgentLauncher_STARTING.toLocalizedString());
+            buffer.append("starting");
             break;
           case RUNNING:
-            buffer.append(LocalizedStrings.AgentLauncher_RUNNING.toLocalizedString());
+            buffer.append("running");
             break;
           case SHUTDOWN_PENDING:
-            buffer.append(LocalizedStrings.AgentLauncher_SHUTDOWN_PENDING.toLocalizedString());
+            buffer.append("shutdown pending");
             break;
           case SHUTDOWN_PENDING_AFTER_FAILED_STARTUP:
-            buffer.append(LocalizedStrings.AgentLauncher_SHUTDOWN_PENDING_AFTER_FAILED_STARTUP
-                .toLocalizedString());
+            buffer.append("shutdown pending after failed startup");
             break;
           default:
-            buffer.append(LocalizedStrings.AgentLauncher_UNKNOWN.toLocalizedString());
+            buffer.append("unknown");
             break;
         }
 
@@ -917,11 +915,11 @@ public class AgentLauncher {
           if (msg != null) {
             buffer.append("\n").append(msg).append(" - ");
           } else {
-            buffer.append("\n " + LocalizedStrings.AgentLauncher_EXCEPTION_IN_0_1
-                .toLocalizedString(this.baseName, exception.getMessage()) + " - ");
+            buffer.append("\n " + String.format("Exception in %s : %s ",
+                this.baseName, exception.getMessage()) + " - ");
           }
           buffer
-              .append(LocalizedStrings.AgentLauncher_SEE_LOG_FILE_FOR_DETAILS.toLocalizedString());
+              .append("See log file for details.");
         }
       }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
index 163da5b..635eb32 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
@@ -45,7 +45,6 @@ import org.apache.geode.admin.internal.ConfigurationParameterImpl;
 import org.apache.geode.internal.admin.ClientMembershipMessage;
 import org.apache.geode.internal.admin.GemFireVM;
 import org.apache.geode.internal.admin.StatResource;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -213,12 +212,12 @@ public class CacheServerJmxImpl extends CacheServerImpl
   }
 
   public void validate() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   @Override
   public Object clone() throws CloneNotSupportedException {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public String getCacheXMLFile() {
@@ -278,8 +277,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
   @Deprecated
   public void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException {
     throw new OperationNotSupportedException(
-        LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY
-            .toLocalizedString());
+        "RefreshInterval can not be set directly. Use DistributedSystemConfig.refreshInterval.");
   }
 
   // -------------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
index 97da076..f645b7e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.Level;
 
 import org.apache.geode.SystemFailure;
 import org.apache.geode.admin.UnmodifiableConfigurationException;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Provides MBean support for managing accessing a ConfigurationParameter.
@@ -64,8 +63,7 @@ public class ConfigurationParameterJmxImpl
   public void setValue(Object value) throws UnmodifiableConfigurationException {
     if (deserialized) {
       throw new UnsupportedOperationException(
-          LocalizedStrings.ConfigurationParameterJmxImpl_REMOTE_MUTATION_OF_CONFIGURATIONPARAMETER_IS_CURRENTLY_UNSUPPORTED
-              .toLocalizedString());
+          "Remote mutation of ConfigurationParameter is currently unsupported.");
     }
     try {
       super.setValue(value);
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
index 55852ca..0430802 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
@@ -19,7 +19,6 @@ import javax.management.modelmbean.ModelMBean;
 
 import org.apache.geode.admin.DistributionLocatorConfig;
 import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Provides MBean support for managing a distribution locator.
@@ -96,12 +95,12 @@ public class DistributionLocatorJmxImpl
   }
 
   public void validate() {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   @Override
   public Object clone() throws CloneNotSupportedException {
-    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+    throw new UnsupportedOperationException("Should not be invoked");
   }
 
   public int getPort() {
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
index acb6ab2..905c591 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
@@ -27,7 +27,6 @@ import org.apache.geode.admin.GemFireHealthConfig;
 import org.apache.geode.admin.RuntimeAdminException;
 import org.apache.geode.admin.internal.GemFireHealthImpl;
 import org.apache.geode.internal.admin.GfManagerAgent;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -110,8 +109,7 @@ public class GemFireHealthJmxImpl extends GemFireHealthImpl implements ManagedRe
 
     } catch (AdminException ex) {
       throw new RuntimeAdminException(
-          LocalizedStrings.GemFireHealthJmxImpl_WHILE_GETTING_THE_DISTRIBUTEDSYSTEMHEALTHCONFIG
-              .toLocalizedString(),
+          "While getting the DistributedSystemHealthConfig",
           ex);
     }
   }
@@ -127,8 +125,7 @@ public class GemFireHealthJmxImpl extends GemFireHealthImpl implements ManagedRe
 
     } catch (AdminException ex) {
       throw new RuntimeAdminException(
-          LocalizedStrings.GemFireHealthJmxImpl_WHILE_GETTING_THE_GEMFIREHEALTHCONFIG
-              .toLocalizedString(),
+          "While getting the GemFireHealthConfig",
           ex);
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
index 1281cac..9ee6aa6 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
@@ -34,7 +34,6 @@ import org.xml.sax.helpers.DefaultHandler;
 
 import org.apache.geode.internal.ClassPathLoader;
 import org.apache.geode.internal.ExitCode;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * A tool that reads the XML description of MBeans used with the Jakarta Commons Modeler and
@@ -135,8 +134,8 @@ public class GenerateMBeanHTML extends DefaultHandler {
   public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
 
     if (publicId == null || systemId == null) {
-      throw new SAXException(LocalizedStrings.GenerateMBeanHTML_PUBLIC_ID_0_SYSTEM_ID_1
-          .toLocalizedString(new Object[] {publicId, systemId}));
+      throw new SAXException(String.format("Public Id: %s System Id: %s",
+          new Object[] {publicId, systemId}));
     }
 
     // Figure out the location for the publicId.
@@ -149,7 +148,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
         result = new InputSource(stream);
       } else {
         throw new SAXNotRecognizedException(
-            LocalizedStrings.GenerateMBeanHTML_DTD_NOT_FOUND_0.toLocalizedString(location));
+            String.format("DTD not found:  %s", location));
       }
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
index 30b0d90..908ee54 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
@@ -43,7 +43,6 @@ import org.apache.logging.log4j.Logger;
 import org.apache.geode.SystemFailure;
 import org.apache.geode.admin.RuntimeAdminException;
 import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -155,25 +154,26 @@ public class MBeanUtil {
         registry = Registry.getRegistry(null, null);
         if (mbeanServer == null) {
           throw new IllegalStateException(
-              LocalizedStrings.MBeanUtil_MBEAN_SERVER_NOT_INITIALIZED_YET.toLocalizedString());
+              "MBean Server is not initialized yet.");
         }
         registry.setMBeanServer(mbeanServer);
 
         String mbeansResource = getOSPath("/org/apache/geode/admin/jmx/mbeans-descriptors.xml");
 
         URL url = ClassPathLoader.getLatest().getResource(MBeanUtil.class, mbeansResource);
-        raiseOnFailure(url != null, LocalizedStrings.MBeanUtil_FAILED_TO_FIND_0
-            .toLocalizedString(new Object[] {mbeansResource}));
+        raiseOnFailure(url != null, String.format("Failed to find %s",
+            new Object[] {mbeansResource}));
         registry.loadMetadata(url);
 
         // simple test to make sure the xml was actually loaded and is valid...
         String[] test = registry.findManagedBeans();
-        raiseOnFailure(test != null && test.length > 0, LocalizedStrings.MBeanUtil_FAILED_TO_LOAD_0
-            .toLocalizedString(new Object[] {mbeansResource}));
+        raiseOnFailure(test != null && test.length > 0,
+            String.format("Failed to load metadata from %s",
+                new Object[] {mbeansResource}));
       } catch (Exception e) {
         logStackTrace(Level.WARN, e);
         throw new RuntimeAdminException(
-            LocalizedStrings.MBeanUtil_FAILED_TO_GET_MBEAN_REGISTRY.toLocalizedString(), e);
+            "Failed to get MBean Registry", e);
       }
     }
     return registry;
@@ -212,8 +212,8 @@ public class MBeanUtil {
       try {
         objName = ObjectName.getInstance(resource.getMBeanName());
       } catch (MalformedObjectNameException e) {
-        throw new MalformedObjectNameException(LocalizedStrings.MBeanUtil_0_IN_1
-            .toLocalizedString(new Object[] {e.getMessage(), resource.getMBeanName()}));
+        throw new MalformedObjectNameException(String.format("%s in '%s'",
+            new Object[] {e.getMessage(), resource.getMBeanName()}));
       }
 
       synchronized (MBeanUtil.class) {
@@ -229,8 +229,10 @@ public class MBeanUtil {
       }
       return objName;
     } catch (java.lang.Exception e) {
-      throw new RuntimeAdminException(LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_MBEAN_FOR_0
-          .toLocalizedString(new Object[] {resource.getMBeanName()}), e);
+      throw new RuntimeAdminException(
+          String.format("Failed to create MBean representation for resource %s.",
+              new Object[] {resource.getMBeanName()}),
+          e);
     }
   }
 
@@ -255,8 +257,8 @@ public class MBeanUtil {
         }
       }
       raiseOnFailure(mbeanServer.isRegistered(objName),
-          LocalizedStrings.MBeanUtil_COULDNT_FIND_MBEAN_REGISTERED_WITH_OBJECTNAME_0
-              .toLocalizedString(new Object[] {objName.toString()}));
+          String.format("Could not find a MBean registered with ObjectName: %s.",
+              new Object[] {objName.toString()}));
       return objName;
     } catch (java.lang.Exception e) {
       throw new RuntimeAdminException(e);
@@ -276,12 +278,12 @@ public class MBeanUtil {
       managed = registry.findManagedBean(resource.getManagedResourceType().getClassTypeName());
     } else {
       throw new IllegalArgumentException(
-          LocalizedStrings.MBeanUtil_MANAGEDBEAN_IS_NULL.toLocalizedString());
+          "ManagedBean is null");
     }
 
     if (managed == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.MBeanUtil_MANAGEDBEAN_IS_NULL.toLocalizedString());
+          "ManagedBean is null");
     }
 
     // customize the defn...
@@ -304,16 +306,15 @@ public class MBeanUtil {
       RefreshNotificationType type, int refreshInterval) {
     if (client == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.MBeanUtil_NOTIFICATIONLISTENER_IS_REQUIRED.toLocalizedString());
+          "NotificationListener is required");
     }
     if (type == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.MBeanUtil_REFRESHNOTIFICATIONTYPE_IS_REQUIRED.toLocalizedString());
+          "RefreshNotificationType is required");
     }
     if (refreshTimerObjectName == null || refreshTimer == null) {
       throw new IllegalStateException(
-          LocalizedStrings.MBeanUtil_REFRESHTIMER_HAS_NOT_BEEN_PROPERLY_INITIALIZED
-              .toLocalizedString());
+          "RefreshTimer has not been properly initialized.");
     }
 
     try {
@@ -345,8 +346,7 @@ public class MBeanUtil {
         } catch (InstanceNotFoundException e) {
           // should not happen since we already checked refreshTimerObjectName
           logStackTrace(Level.WARN, e,
-              LocalizedStrings.MBeanUtil_COULD_NOT_FIND_REGISTERED_REFRESHTIMER_INSTANCE
-                  .toLocalizedString());
+              "Could not find registered RefreshTimer instance.");
         }
       }
 
@@ -463,13 +463,13 @@ public class MBeanUtil {
       refreshTimer.start();
     } catch (JMException e) {
       logStackTrace(Level.WARN, e,
-          LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
+          "Failed to create/register/start refresh timer.");
     } catch (JMRuntimeException e) {
       logStackTrace(Level.WARN, e,
-          LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
+          "Failed to create/register/start refresh timer.");
     } catch (Exception e) {
       logStackTrace(Level.WARN, e,
-          LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
+          "Failed to create/register/start refresh timer.");
     }
   }
 
@@ -583,16 +583,16 @@ public class MBeanUtil {
       }
     } catch (MBeanRegistrationException e) {
       logStackTrace(Level.WARN, null,
-          LocalizedStrings.MBeanUtil_FAILED_WHILE_UNREGISTERING_MBEAN_WITH_OBJECTNAME_0
-              .toLocalizedString(new Object[] {objectName}));
+          String.format("Failed while unregistering MBean with ObjectName : %s",
+              new Object[] {objectName}));
     } catch (InstanceNotFoundException e) {
       logStackTrace(Level.WARN, null,
-          LocalizedStrings.MBeanUtil_WHILE_UNREGISTERING_COULDNT_FIND_MBEAN_WITH_OBJECTNAME_0
-              .toLocalizedString(new Object[] {objectName}));
+          String.format("While unregistering, could not find MBean with ObjectName : %s",
+              new Object[] {objectName}));
     } catch (JMRuntimeException e) {
       logStackTrace(Level.WARN, null,
-          LocalizedStrings.MBeanUtil_COULD_NOT_UNREGISTER_MBEAN_WITH_OBJECTNAME_0
-              .toLocalizedString(new Object[] {objectName}));
+          String.format("Could not un-register MBean with ObjectName : %s",
+              new Object[] {objectName}));
     }
   }
 
@@ -655,8 +655,8 @@ public class MBeanUtil {
       } catch (InstanceNotFoundException xptn) {
         // should not happen since we already checked refreshTimerObjectName
         logStackTrace(Level.WARN, null,
-            LocalizedStrings.MBeanUtil_WHILE_UNREGISTERING_COULDNT_FIND_MBEAN_WITH_OBJECTNAME_0
-                .toLocalizedString(new Object[] {refreshTimerObjectName}));
+            String.format("While unregistering, could not find MBean with ObjectName : %s",
+                new Object[] {refreshTimerObjectName}));
       }
     }
   }
@@ -698,8 +698,8 @@ public class MBeanUtil {
               if (entry == null)
                 return;
               if (!(entry instanceof ManagedResource)) {
-                throw new ClassCastException(LocalizedStrings.MBeanUtil_0_IS_NOT_A_MANAGEDRESOURCE
-                    .toLocalizedString(new Object[] {entry.getClass().getName()}));
+                throw new ClassCastException(String.format("%s  is not a ManagedResource",
+                    new Object[] {entry.getClass().getName()}));
               }
               ManagedResource resource = (ManagedResource) entry;
               {
@@ -712,12 +712,10 @@ public class MBeanUtil {
       }, null, null);
     } catch (JMException e) {
       logStackTrace(Level.WARN, e,
-          LocalizedStrings.MBeanUtil_FAILED_TO_REGISTER_SERVERNOTIFICATIONLISTENER
-              .toLocalizedString());
+          "Failed to register ServerNotificationListener.");
     } catch (JMRuntimeException e) {
       logStackTrace(Level.WARN, e,
-          LocalizedStrings.MBeanUtil_FAILED_TO_REGISTER_SERVERNOTIFICATIONLISTENER
-              .toLocalizedString());
+          "Failed to register ServerNotificationListener.");
     }
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
index d3f4ab2..f897a98 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
@@ -57,7 +57,6 @@ import mx4j.persist.MBeanPersister;
 import mx4j.persist.PersisterMBean;
 import mx4j.util.Utils;
 
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * @author <a href="mailto:biorn_steedom@users.sourceforge.net">Simone Bordet</a>
@@ -90,16 +89,14 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       load();
     } catch (Exception x) {
       Logger logger = getLogger();
-      logger.warn(LocalizedStrings.MX4JModelMBean_CANNOT_RESTORE_PREVIOUSLY_SAVED_STATUS
-          .toLocalizedString(), x);
+      logger.warn("Cannot restore previously saved status", x);
     }
   }
 
   public MX4JModelMBean(ModelMBeanInfo info) throws MBeanException, RuntimeOperationsException {
     if (info == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_PARAMETER_CANT_BE_NULL
-              .toLocalizedString()));
+          "ModelMBeanInfo parameter cannot be null."));
     else
       setModelMBeanInfo(info);
   }
@@ -114,8 +111,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       return name;
     } else {
       throw new MBeanRegistrationException(new IllegalStateException(
-          LocalizedStrings.MX4JModelMBean_MODELMBEAN_CANNOT_BE_REGISTERED_UNTIL_SETMODELMBEANINFO_HAS_BEEN_CALLED
-              .toLocalizedString()));
+          "ModelMBean cannot be registered until setModelMBeanInfo has been called."));
     }
   }
 
@@ -143,10 +139,10 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       throws MBeanException, RuntimeOperationsException {
     if (modelMBeanInfo == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_CANNOT_BE_NULL.toLocalizedString()));
+          "ModelMBeanInfo cannot be null."));
     if (!isModelMBeanInfoValid(modelMBeanInfo))
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_INVALID.toLocalizedString()));
+          "ModelMBeanInfo is invalid."));
 
     m_modelMBeanInfo = (ModelMBeanInfo) modelMBeanInfo.clone();
 
@@ -168,7 +164,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       RuntimeOperationsException, InstanceNotFoundException, InvalidTargetObjectTypeException {
     if (resource == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_MANAGED_RESOURCE_CANNOT_BE_NULL.toLocalizedString()));
+          "Managed resource cannot be null."));
     if (!isResourceTypeSupported(resourceType))
       throw new InvalidTargetObjectTypeException(resourceType);
 
@@ -196,7 +192,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       throws MBeanException, RuntimeOperationsException, IllegalArgumentException {
     if (listener == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_LISTENER_CANNOT_BE_NULL.toLocalizedString()));
+          "Listener cannot be null."));
     AttributeChangeNotificationFilter filter = new AttributeChangeNotificationFilter();
     if (attributeName != null) {
       filter.enableAttribute(attributeName);
@@ -240,7 +236,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       throws MBeanException, RuntimeOperationsException, ListenerNotFoundException {
     if (listener == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_LISTENER_CANNOT_BE_NULL.toLocalizedString()));
+          "Listener cannot be null."));
     AttributeChangeNotificationFilter filter = new AttributeChangeNotificationFilter();
     if (attributeName != null) {
       filter.enableAttribute(attributeName);
@@ -274,10 +270,10 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       throws MBeanException, RuntimeOperationsException {
     if (oldAttribute == null || newAttribute == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_CANNOT_BE_NULL.toLocalizedString()));
+          "Attribute cannot be null."));
     if (!oldAttribute.getName().equals(newAttribute.getName()))
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAMES_CANNOT_BE_DIFFERENT.toLocalizedString()));
+          "Attribute names cannot be different."));
 
     // TODO: the source must be the object name of the MBean if the listener was registered through
     // MBeanServer
@@ -292,7 +288,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       throws MBeanException, RuntimeOperationsException {
     if (notification == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_NOTIFICATION_CANNOT_BE_NULL.toLocalizedString()));
+          "Notification cannot be null."));
 
     getAttributeChangeBroadcaster().sendNotification(notification);
 
@@ -321,7 +317,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
   public AttributeList getAttributes(String[] attributes) {
     if (attributes == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAMES_CANNOT_BE_NULL.toLocalizedString()));
+          "Attribute names cannot be null."));
 
     Logger logger = getLogger();
 
@@ -346,7 +342,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       throws AttributeNotFoundException, MBeanException, ReflectionException {
     if (attribute == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAME_CANNOT_BE_NULL.toLocalizedString()));
+          "Attribute name cannot be null."));
 
     Logger logger = getLogger();
 
@@ -354,7 +350,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     ModelMBeanInfo info = getModelMBeanInfo();
     if (info == null)
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString());
+          "ModelMBeanInfo is null");
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("ModelMBeanInfo is: " + info);
 
@@ -362,19 +358,19 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     ModelMBeanAttributeInfo attrInfo = info.getAttribute(attribute);
     if (attrInfo == null)
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANATTRIBUTEINFO_FOR_ATTRIBUTE_0
-              .toLocalizedString(attribute));
+          String.format("Cannot find ModelMBeanAttributeInfo for attribute  %s",
+              attribute));
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("Attribute info is: " + attrInfo);
     if (!attrInfo.isReadable())
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_0_IS_NOT_READABLE.toLocalizedString(attribute));
+          String.format("Attribute  %s  is not readable", attribute));
 
     // This returns a clone of the mbean descriptor, we use it read only
     Descriptor mbeanDescriptor = info.getMBeanDescriptor();
     if (mbeanDescriptor == null)
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString());
+          "MBean descriptor cannot be null");
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("MBean descriptor is: " + mbeanDescriptor);
 
@@ -382,8 +378,8 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     Descriptor attributeDescriptor = attrInfo.getDescriptor();
     if (attributeDescriptor == null)
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_DESCRIPTOR_FOR_ATTRIBUTE_0_CANNOT_BE_NULL
-              .toLocalizedString(attribute));
+          String.format("Attribute descriptor for attribute  %s  cannot be null",
+              attribute));
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("Attribute descriptor is: " + attributeDescriptor);
 
@@ -474,7 +470,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
   public AttributeList setAttributes(AttributeList attributes) {
     if (attributes == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_LIST_CANNOT_BE_NULL.toLocalizedString()));
+          "Attribute list cannot be null."));
 
     Logger logger = getLogger();
 
@@ -498,7 +494,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       InvalidAttributeValueException, MBeanException, ReflectionException {
     if (attribute == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_CANNOT_BE_NULL.toLocalizedString()));
+          "Attribute cannot be null."));
 
     Logger logger = getLogger();
 
@@ -507,7 +503,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     ModelMBeanInfo info = getModelMBeanInfo();
     if (info == null)
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString());
+          "ModelMBeanInfo is null");
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("ModelMBeanInfo is: " + info);
 
@@ -518,20 +514,20 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     ModelMBeanAttributeInfo attrInfo = info.getAttribute(attrName);
     if (attrInfo == null)
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANATTRIBUTEINFO_FOR_ATTRIBUTE_0
-              .toLocalizedString(attrName));
+          String.format("Cannot find ModelMBeanAttributeInfo for attribute  %s",
+              attrName));
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("Attribute info is: " + attrInfo);
 
     if (!attrInfo.isWritable())
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_0_IS_NOT_WRITABLE.toLocalizedString(attrName));
+          String.format("Attribute  %s  is not writable", attrName));
 
     // This returns a clone of the mbean descriptor, we use it read only
     Descriptor mbeanDescriptor = info.getMBeanDescriptor();
     if (mbeanDescriptor == null)
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString());
+          "MBean descriptor cannot be null");
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("MBean descriptor is: " + mbeanDescriptor);
 
@@ -539,8 +535,8 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     Descriptor attributeDescriptor = attrInfo.getDescriptor();
     if (attributeDescriptor == null)
       throw new AttributeNotFoundException(
-          LocalizedStrings.MX4JModelMBean_ATTRIBUTE_DESCRIPTOR_FOR_ATTRIBUTE_0_CANNOT_BE_NULL
-              .toLocalizedString(attrName));
+          String.format("Attribute descriptor for attribute  %s  cannot be null",
+              attrName));
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("Attribute descriptor is: " + attributeDescriptor);
 
@@ -612,7 +608,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
         if (logger.isEnabledFor(Logger.TRACE))
           logger.trace("ModelMBean persisted successfully");
       } catch (Exception x) {
-        logger.error(LocalizedStrings.MX4JModelMBean_CANNOT_STORE_MODELMBEAN_AFTER_SETATTRIBUTE, x);
+        logger.error("Cannot store ModelMBean after setAttribute", x);
         if (x instanceof MBeanException)
           throw (MBeanException) x;
         else
@@ -625,7 +621,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       throws MBeanException, ReflectionException {
     if (method == null)
       throw new RuntimeOperationsException(new IllegalArgumentException(
-          LocalizedStrings.MX4JModelMBean_METHOD_NAME_CANNOT_BE_NULL.toLocalizedString()));
+          "Method name cannot be null."));
     if (arguments == null)
       arguments = new Object[0];
     if (params == null)
@@ -637,7 +633,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     ModelMBeanInfo info = getModelMBeanInfo();
     if (info == null)
       throw new MBeanException(new ServiceNotFoundException(
-          LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString()));
+          "ModelMBeanInfo is null"));
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("ModelMBeanInfo is: " + info);
 
@@ -645,8 +641,8 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     ModelMBeanOperationInfo operInfo = info.getOperation(method);
     if (operInfo == null)
       throw new MBeanException(new ServiceNotFoundException(
-          LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANOPERATIONINFO_FOR_OPERATION_0
-              .toLocalizedString(method)));
+          String.format("Cannot find ModelMBeanOperationInfo for operation  %s",
+              method)));
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("Operation info is: " + operInfo);
 
@@ -654,13 +650,13 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     Descriptor operationDescriptor = operInfo.getDescriptor();
     if (operationDescriptor == null)
       throw new MBeanException(new ServiceNotFoundException(
-          LocalizedStrings.MX4JModelMBean_OPERATION_DESCRIPTOR_FOR_OPERATION_0_CANNOT_BE_NULL
-              .toLocalizedString(method)));
+          String.format("Operation descriptor for operation  %s  cannot be null",
+              method)));
     String role = (String) operationDescriptor.getFieldValue("role");
     if (role == null || !role.equals("operation"))
       throw new MBeanException(new ServiceNotFoundException(
-          LocalizedStrings.MX4JModelMBean_OPERATION_DESCRIPTOR_FIELD_ROLE_MUST_BE_OPERATION_NOT_0
-              .toLocalizedString(role)));
+          String.format("Operation descriptor field 'role' must be 'operation', not  %s",
+              role)));
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("Operation descriptor is: " + operationDescriptor);
 
@@ -668,7 +664,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
     Descriptor mbeanDescriptor = info.getMBeanDescriptor();
     if (mbeanDescriptor == null)
       throw new MBeanException(new ServiceNotFoundException(
-          LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString()));
+          "MBean descriptor cannot be null"));
     if (logger.isEnabledFor(Logger.DEBUG))
       logger.debug("MBean descriptor is: " + mbeanDescriptor);
 
@@ -688,7 +684,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       try {
         parameters = Utils.loadClasses(Thread.currentThread().getContextClassLoader(), params);
       } catch (ClassNotFoundException x) {
-        logger.error(LocalizedStrings.MX4JModelMBean_CANNOT_FIND_OPERATIONS_PARAMETER_CLASSES, x);
+        logger.error("Cannot find operation's parameter classes", x);
         throw new ReflectionException(x);
       }
 
@@ -752,7 +748,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
           logger.trace("ModelMBean persisted successfully");
       } catch (Exception x) {
         logger.error(
-            LocalizedStrings.MX4JModelMBean_CANNOT_STORE_MODELMBEAN_AFTER_OPERATION_INVOCATION, x);
+            "Cannot store ModelMBean after operation invocation", x);
         if (x instanceof MBeanException)
           throw (MBeanException) x;
         else
@@ -828,7 +824,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
       return true;
     } else {
       throw new ImplementationException(
-          LocalizedStrings.MX4JModelMBean_INVALID_PERSIST_VALUE.toLocalizedString());
+          "Invalid persist value");
     }
   }
 
@@ -970,7 +966,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
 
     if (realTarget == null)
       throw new MBeanException(new ServiceNotFoundException(
-          LocalizedStrings.MX4JModelMBean_COULD_NOT_FIND_TARGET.toLocalizedString()));
+          "Could not find target"));
 
     if (method == null) {
       try {
@@ -1060,8 +1056,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
         MBeanServer server = getMBeanServer();
         if (server == null)
           throw new MBeanException(new IllegalStateException(
-              LocalizedStrings.MX4JModelMBean_MX4JMODELMBEAN_IS_NOT_REGISTERED
-                  .toLocalizedString()));
+              "MX4JModelMBean is not registered."));
         if (server.isRegistered(objectName)) {
           MBeanLogger l = new MBeanLogger(server, objectName);
           if (logger.isEnabledFor(Logger.DEBUG))
@@ -1140,8 +1135,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
         MBeanServer server = getMBeanServer();
         if (server == null)
           throw new MBeanException(new IllegalStateException(
-              LocalizedStrings.MX4JModelMBean_MX4JMODELMBEAN_IS_NOT_REGISTERED
-                  .toLocalizedString()));
+              "MX4JModelMBean is not registered."));
 
         if (server.isRegistered(objectName)
             && server.isInstanceOf(objectName, PersisterMBean.class.getName())) {
@@ -1225,8 +1219,7 @@ public class MX4JModelMBean implements ModelMBean, MBeanRegistration, Notificati
         logger.trace(
             "Parameter value's class and attribute's declared return class are not assignable");
       throw new MBeanException(new InvalidAttributeValueException(
-          LocalizedStrings.MX4JModelMBean_RETURNED_TYPE_AND_DECLARED_TYPE_ARE_NOT_ASSIGNABLE
-              .toLocalizedString()));
+          "Returned type and declared type are not assignable."));
     }
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
index 393fc1b..3562752 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
@@ -29,9 +29,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.SystemFailure;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Provides the ways to send emails to all the registered email id It also provides the way to
@@ -86,8 +84,7 @@ public class MailManager {
 
     if (mailHost == null || mailHost.length() == 0 || emailData == null
         || mailToAddresses.length == 0) {
-      logger.error(LocalizedMessage
-          .create(LocalizedStrings.MailManager_REQUIRED_MAILSERVER_CONFIGURATION_NOT_SPECIFIED));
+      logger.error("Required mail server configuration is not specfied.");
       if (logger.isDebugEnabled()) {
         logger.debug("Exited MailManager:processEmail: Not sending email as conditions not met");
       }
@@ -106,7 +103,7 @@ public class MailManager {
       }
 
       if (subject == null) {
-        subject = LocalizedStrings.MailManager_ALERT_MAIL_SUBJECT.toLocalizedString();
+        subject = "Alert from GemFire Admin Agent";
       }
       mimeMessage.setSubject(subject);
 
@@ -116,9 +113,8 @@ public class MailManager {
       mimeMessage.setText(message);
 
       Transport.send(mimeMessage);
-      logger.info(
-          LocalizedMessage.create(LocalizedStrings.MailManager_EMAIL_ALERT_HAS_BEEN_SENT_0_1_2,
-              new Object[] {mailToList, subject, message}));
+      logger.info("Email sent to {}. Subject: {}, Content: {}",
+          new Object[] {mailToList, subject, message});
     } catch (VirtualMachineError err) {
       SystemFailure.initiateFailure(err);
       // If this ever returns, rethrow the error. We're poisoned
@@ -132,21 +128,19 @@ public class MailManager {
       // is still usable:
       SystemFailure.checkFailure();
       StringBuilder buf = new StringBuilder();
-      buf.append(LocalizedStrings.MailManager_AN_EXCEPTION_OCCURRED_WHILE_SENDING_EMAIL
-          .toLocalizedString());
+      buf.append("An exception occurred while sending email.");
       buf.append(
-          LocalizedStrings.MailManager_UNABLE_TO_SEND_EMAIL_PLEASE_CHECK_YOUR_EMAIL_SETTINGS_AND_LOG_FILE
-              .toLocalizedString());
+          "Unable to send email. Please check your mail settings and the log file.");
       buf.append("\n\n").append(
-          LocalizedStrings.MailManager_EXCEPTION_MESSAGE_0.toLocalizedString(ex.getMessage()));
+          String.format("Exception message: %s", ex.getMessage()));
       buf.append("\n\n").append(
-          LocalizedStrings.MailManager_FOLLOWING_EMAIL_WAS_NOT_DELIVERED.toLocalizedString());
+          "Following email was not delivered:");
       buf.append("\n\t")
-          .append(LocalizedStrings.MailManager_MAIL_HOST_0.toLocalizedString(mailHost));
-      buf.append("\n\t").append(LocalizedStrings.MailManager_FROM_0.toLocalizedString(mailFrom));
-      buf.append("\n\t").append(LocalizedStrings.MailManager_TO_0.toLocalizedString(mailToList));
-      buf.append("\n\t").append(LocalizedStrings.MailManager_SUBJECT_0.toLocalizedString(subject));
-      buf.append("\n\t").append(LocalizedStrings.MailManager_CONTENT_0.toLocalizedString(message));
+          .append(String.format("Mail Host: %s", mailHost));
+      buf.append("\n\t").append(String.format("From: %s", mailFrom));
+      buf.append("\n\t").append(String.format("To: %s", mailToList));
+      buf.append("\n\t").append(String.format("Subject: %s", subject));
+      buf.append("\n\t").append(String.format("Content: %s", message));
 
       logger.error(buf.toString(), ex);
     }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
index d86c675..159ed7c 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -67,9 +67,7 @@ import org.apache.geode.cache.SubscriptionAttributes;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.GemFireVersion;
 import org.apache.geode.internal.admin.remote.ClientHealthStats;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * This class uses the JMX Attributes/Operations that use (return/throw) GemFire types. This is the
@@ -381,15 +379,12 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
         members = membersList.toArray(members);
       }
     } catch (AdminException e) {
-      logger.warn(
-          LocalizedMessage.create(
-              LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0, "getMembers"),
+      logger.warn("Exception occurred for operation: getMembers",
           e);
       throw new OperationsException(e.getMessage());
     } catch (Exception e) {
       logger.warn(
-          LocalizedMessage.create(
-              LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0, "getMembers"),
+          "Exception occurred for operation: getMembers",
           e);
       throw new OperationsException(e.getMessage());
     }
@@ -422,14 +417,14 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
           }
         }
       } catch (AdminException e) {
-        logger.warn(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
-            new Object[] {"getRegions", memberId}), e);
+        logger.warn(String.format("Exception occurred for operation: %s for member: %s",
+            new Object[] {"getRegions", memberId}),
+            e);
         throw new OperationsException(e.getMessage());
       } catch (Exception e) {
-        logger.warn(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
-            new Object[] {"getRegions", memberId}), e);
+        logger.warn(String.format("Exception occurred for operation: %s for member: %s",
+            new Object[] {"getRegions", memberId}),
+            e);
         throw new OperationsException(e.getMessage());
       }
     }
@@ -454,9 +449,10 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
           try {
             initializeCacheRegionsAndStats((SystemMemberJmx) cacheVms[i]);
           } catch (AdminException e) {
-            logger.info(LocalizedMessage.create(
-                LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING,
-                cacheVms[i].getId()), e);
+            logger.info(String.format(
+                "Exception occurred while intializing : %s. Contiuning with next  ...",
+                cacheVms[i].getId()),
+                e);
           }
         }
         SystemMember[] appVms = adminDSJmx.getSystemMemberApplications();
@@ -464,19 +460,18 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
           try {
             initializeCacheRegionsAndStats((SystemMemberJmx) appVms[i]);
           } catch (AdminException e) {
-            logger.info(LocalizedMessage.create(
-                LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING,
-                appVms[i].getId()), e);
+            logger.info(String.format(
+                "Exception occurred while intializing : %s. Contiuning with next  ...",
+                appVms[i].getId()),
+                e);
           }
         }
       }
     } catch (AdminException e) {
-      logger.warn(LocalizedMessage
-          .create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING), e);
+      logger.warn("Exception occurred while intializing.", e);
       throw new OperationsException(e.getMessage());
     } catch (Exception e) {
-      logger.warn(LocalizedMessage
-          .create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING), e);
+      logger.warn("Exception occurred while intializing.", e);
       throw new OperationsException(e.getMessage());
     }
 
@@ -541,9 +536,10 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
       try {
         initializeRegionSubRegions(cache, subRegion);
       } catch (AdminException e) {
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING,
-            subRegion.getFullPath()), e);
+        logger.info(
+            String.format("Exception occurred while intializing : %s. Contiuning with next  ...",
+                subRegion.getFullPath()),
+            e);
       }
     }
   }
@@ -724,14 +720,14 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
         }
 
       } catch (AdminException e) {
-        logger.warn(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
-            new Object[] {"getMemberDetails", memberId}), e);
+        logger.warn(String.format("Exception occurred for operation: %s for member: %s",
+            new Object[] {"getMemberDetails", memberId}),
+            e);
         throw new OperationsException(e.getMessage());
       } catch (Exception e) {
-        logger.warn(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
-            new Object[] {"getMemberDetails", memberId}), e);
+        logger.warn(String.format("Exception occurred for operation: %s for member: %s",
+            new Object[] {"getMemberDetails", memberId}),
+            e);
         throw new OperationsException(e.getMessage());
       }
     }
@@ -804,12 +800,10 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
         RegionSubRegionSnapshot regionSnapshot = cache.getRegionSnapshot();
         collectAllRegionsDetails(cache, regionSnapshot, regionsInfo, existingRegionMbeans);
       } catch (AdminException e) {
-        logger.warn(LocalizedMessage.create(LocalizedStrings.ONE_ARG,
-            "Exception occurred while getting region details."), e);
+        logger.warn("Exception occurred while getting region details.", e);
         throw new OperationsException(e.getMessage());
       } catch (Exception e) {
-        logger.warn(LocalizedMessage.create(LocalizedStrings.ONE_ARG,
-            "Exception occurred while getting region details."), e);
+        logger.warn("Exception occurred while getting region details.", e);
         throw new OperationsException(e.getMessage());
       }
     }
@@ -1021,9 +1015,8 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No
         }
 
         if (needToReinit) {
-          logger.info(LocalizedMessage.create(
-              LocalizedStrings.MemberInfoWithStatsMBean_REINITIALIZING_STATS_FOR_0,
-              member.getId()));
+          logger.info("Re-initializing statistics for: {}",
+              member.getId());
           initStats(member);
 
           vmMemoryUsageStats = getExistingStats(member.getId(), "vmHeapMemoryStats");
@@ -1280,46 +1273,27 @@ class NotificationForwarder extends NotificationBroadcasterSupport implements No
         }
         logger.debug("getStatistics call completed with no exceptions.");
       } catch (ReflectionException e) {
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0,
-            source.toString()), e);
+        logger.info(String.format("Exception while initializing statistics for: %s",
+            source.toString()),
+            e);
       } catch (MBeanException e) {
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0,
-            source.toString()), e);
+        logger.info(String.format("Exception while initializing statistics for: %s",
+            source.toString()),
+            e);
       } catch (InstanceNotFoundException e) {
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0,
-            source.toString()), e);
+        logger.info(String.format("Exception while initializing statistics for: %s",
+            source.toString()),
+            e);
       }
       // register this listener for joined member's cache/region notifications
       try {
         registerNotificationListener(source);
       } catch (OperationsException e) {
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_REGISTERING_NOTIFICATION_LISTENER_FOR_0,
-            source.toString()), e);
+        logger.info(String.format("Exception while registering notification listener for: %s",
+            source.toString()),
+            e);
       }
-    } /*
-       * else if (AdminDistributedSystemJmxImpl.NOTIF_MEMBER_LEFT.equals(notification.getType()) ||
-       * AdminDistributedSystemJmxImpl.NOTIF_MEMBER_CRASHED.equals(notification.getType())) {
-       * ObjectName source = (ObjectName) notifSource; //unregister this listener from left member's
-       * cache/region notifications try { unregisterNotificationListener(source); } catch
-       * (OperationsException e) { logwriter.info(LocalizedMessage.create(LocalizedStrings.
-       * MemberInfoWithStatsMBean_EXCEPTION_WHILE_UNREGISTERING_NOTIFICATION_LISTENER_FOR_0,
-       * source.toString(), e); } } else if
-       * (AdminDistributedSystemJmxImpl.NOTIF_ADMIN_SYSTEM_DISCONNECT.equals(notification.getType())
-       * ) { String source = (String) notifSource; //This notification does not have ObjectName as a
-       * source. try { ObjectName instance = ObjectName.getInstance(source);
-       * unregisterNotificationListener(instance); } catch (OperationsException e) {
-       * logwriter.info(LocalizedMessage.create(LocalizedStrings.
-       * MemberInfoWithStatsMBean_EXCEPTION_WHILE_UNREGISTERING_NOTIFICATION_LISTENER_FOR_0,
-       * source.toString(), e); } catch (NullPointerException e) {
-       * logwriter.info(LocalizedMessage.create(LocalizedStrings.
-       * MemberInfoWithStatsMBean_EXCEPTION_WHILE_UNREGISTERING_NOTIFICATION_LISTENER_FOR_0,
-       * source.toString(), e); } }
-       */
-    // NOTIF_ALERT is sent as is
+    }
 
     // TODO: Check if same notification instance can be reused by simply changing the sequence
     // number
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
index c1481f3..b84054b 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
@@ -27,7 +27,6 @@ import org.apache.geode.SystemFailure;
 import org.apache.geode.admin.AdminException;
 import org.apache.geode.admin.Statistic;
 import org.apache.geode.internal.admin.StatResource;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -154,8 +153,7 @@ public class StatisticResourceJmxImpl extends org.apache.geode.admin.internal.St
   @Deprecated
   public void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException {
     throw new OperationNotSupportedException(
-        LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY
-            .toLocalizedString());
+        "RefreshInterval can not be set directly. Use DistributedSystemConfig.refreshInterval.");
   }
 
   // -------------------------------------------------------------------------
@@ -228,7 +226,7 @@ public class StatisticResourceJmxImpl extends org.apache.geode.admin.internal.St
       throws org.apache.geode.admin.AdminException {
     if (managed == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.StatisticResourceJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
+          "ManagedBean is null");
     }
 
     refresh(); // to get the stats...
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
index 7a5e5b2..f57429f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
@@ -36,7 +36,6 @@ import org.apache.geode.admin.internal.SystemMemberBridgeServerImpl;
 import org.apache.geode.cache.Region;
 import org.apache.geode.internal.admin.AdminBridgeServer;
 import org.apache.geode.internal.admin.GemFireVM;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * MBean representation of {@link org.apache.geode.admin.SystemMemberCache}.
@@ -160,7 +159,7 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
       throws org.apache.geode.admin.AdminException {
     if (managed == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.SystemMemberCacheJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
+          "ManagedBean is null");
     }
 
     refresh(); // to get the stats...
@@ -210,8 +209,8 @@ public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.Sy
 
       if (region == null) {
         throw new AdminException(
-            LocalizedStrings.SystemMemberCacheJmxImpl_THIS_CACHE_DOES_NOT_CONTAIN_REGION_0
-                .toLocalizedString(path));
+            String.format("This cache does not contain region %s",
+                path));
 
       } else {
         return ObjectName.getInstance(region.getMBeanName());
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
index c162f2c..f538593 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
@@ -39,9 +39,7 @@ import org.apache.geode.admin.SystemMemberRegionEvent;
 import org.apache.geode.cache.Operation;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.admin.ClientMembershipMessage;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Defines methods that all <code>SystemMember</code> MBeans should implement.
@@ -243,8 +241,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
         if (cache == null) {
           IthrewIt = true;
           throw new AdminException(
-              LocalizedStrings.SystemMemberJmx_THIS_SYSTEM_MEMBER_DOES_NOT_HAVE_A_CACHE
-                  .toLocalizedString());
+              "This System Member does not have a Cache.");
         }
         SystemMemberCacheJmxImpl cacheJmx = (SystemMemberCacheJmxImpl) cache;
         return ObjectName.getInstance(cacheJmx.getMBeanName());
@@ -374,7 +371,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
 
       if (managed == null) {
         throw new IllegalArgumentException(
-            LocalizedStrings.SystemMemberJmx_MANAGEDBEAN_IS_NULL.toLocalizedString());
+            "ManagedBean is null");
       }
 
       member.refreshConfig(); // to get the config parms...
@@ -453,17 +450,13 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
         }
       } catch (RuntimeOperationsException e) {
         logger
-            .info(
-                LocalizedMessage.create(
-                    LocalizedStrings.SystemMemberJmx_FAILED_TO_SEND_0_NOTIFICATION_FOR_1,
-                    new Object[] {"'" + notif.getType() + "'", "'" + notif.getMessage() + "'"}),
+            .info(String.format("Failed to send %s notification for %s",
+                new Object[] {"'" + notif.getType() + "'", "'" + notif.getMessage() + "'"}),
                 e);
       } catch (MBeanException e) {
         logger
-            .info(
-                LocalizedMessage.create(
-                    LocalizedStrings.SystemMemberJmx_FAILED_TO_SEND_0_NOTIFICATION_FOR_1,
-                    new Object[] {"'" + notif.getType() + "'", "'" + notif.getMessage() + "'"}),
+            .info(String.format("Failed to send %s notification for %s",
+                new Object[] {"'" + notif.getType() + "'", "'" + notif.getMessage() + "'"}),
                 e);
       }
     }
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
index 75c40b4..548d865 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
@@ -44,7 +44,6 @@ import org.apache.geode.internal.admin.ApplicationVM;
 import org.apache.geode.internal.admin.ClientMembershipMessage;
 import org.apache.geode.internal.admin.GemFireVM;
 import org.apache.geode.internal.admin.StatResource;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -151,8 +150,7 @@ public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemM
   @Deprecated
   public void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException {
     throw new OperationNotSupportedException(
-        LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY
-            .toLocalizedString());
+        "RefreshInterval can not be set directly. Use DistributedSystemConfig.refreshInterval.");
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
index 93d9a99..69c24e0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.cache.UserSpecifiedRegionAttributes;
 import org.apache.geode.internal.cache.persistence.DefaultDiskDirs;
 import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Creates instances of {@link RegionAttributes}. An {@code AttributesFactory} instance maintains
@@ -490,8 +489,7 @@ public class AttributesFactory<K, V> {
   public void addCacheListener(CacheListener<K, V> aListener) {
     if (aListener == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_ADDCACHELISTENER_PARAMETER_WAS_NULL
-              .toLocalizedString());
+          "addCacheListener parameter was null");
     }
     synchronized (this.regionAttributes) {
       this.regionAttributes.addCacheListener(aListener);
@@ -513,8 +511,7 @@ public class AttributesFactory<K, V> {
         List<CacheListener<K, V>> nl = Arrays.asList(newListeners);
         if (nl.contains(null)) {
           throw new IllegalArgumentException(
-              LocalizedStrings.AttributesFactory_INITCACHELISTENERS_PARAMETER_HAD_A_NULL_ELEMENT
-                  .toLocalizedString());
+              "initCacheListeners parameter had a null element");
         }
         this.regionAttributes.cacheListeners = new ArrayList<CacheListener<K, V>>(nl);
       }
@@ -535,7 +532,7 @@ public class AttributesFactory<K, V> {
   public void setEntryIdleTimeout(ExpirationAttributes idleTimeout) {
     if (idleTimeout == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_IDLETIMEOUT_MUST_NOT_BE_NULL.toLocalizedString());
+          "idleTimeout must not be null");
     }
     this.regionAttributes.entryIdleTimeout = idleTimeout.getTimeout();
     this.regionAttributes.entryIdleTimeoutExpirationAction = idleTimeout.getAction();
@@ -562,7 +559,7 @@ public class AttributesFactory<K, V> {
   public void setEntryTimeToLive(ExpirationAttributes timeToLive) {
     if (timeToLive == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_TIMETOLIVE_MUST_NOT_BE_NULL.toLocalizedString());
+          "timeToLive must not be null");
     }
     this.regionAttributes.entryTimeToLive = timeToLive.getTimeout();
     this.regionAttributes.entryTimeToLiveExpirationAction = timeToLive.getAction();
@@ -590,7 +587,7 @@ public class AttributesFactory<K, V> {
   public void setRegionIdleTimeout(ExpirationAttributes idleTimeout) {
     if (idleTimeout == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_IDLETIMEOUT_MUST_NOT_BE_NULL.toLocalizedString());
+          "idleTimeout must not be null");
     }
     this.regionAttributes.regionIdleTimeout = idleTimeout.getTimeout();
     this.regionAttributes.regionIdleTimeoutExpirationAction = idleTimeout.getAction();
@@ -608,7 +605,7 @@ public class AttributesFactory<K, V> {
   public void setRegionTimeToLive(ExpirationAttributes timeToLive) {
     if (timeToLive == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_TIMETOLIVE_MUST_NOT_BE_NULL.toLocalizedString());
+          "timeToLive must not be null");
     }
     this.regionAttributes.regionTimeToLive = timeToLive.getTimeout();
     this.regionAttributes.regionTimeToLiveExpirationAction = timeToLive.getAction();
@@ -627,7 +624,7 @@ public class AttributesFactory<K, V> {
   public void setScope(Scope scopeType) {
     if (scopeType == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_SCOPETYPE_MUST_NOT_BE_NULL.toLocalizedString());
+          "scopeType must not be null");
     }
     this.regionAttributes.setScope(scopeType);
   }
@@ -662,7 +659,7 @@ public class AttributesFactory<K, V> {
   public void setMirrorType(MirrorType mirrorType) {
     if (mirrorType == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_MIRRORTYPE_MUST_NOT_BE_NULL.toLocalizedString());
+          "mirrorType must not be null");
     }
     DataPolicy dp = mirrorType.getDataPolicy();
     if (dp.withReplication()) {
@@ -690,13 +687,13 @@ public class AttributesFactory<K, V> {
   public void setDataPolicy(DataPolicy dataPolicy) {
     if (dataPolicy == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_DATAPOLICY_MUST_NOT_BE_NULL.toLocalizedString());
+          "dataPolicy must not be null");
     }
     if (this.regionAttributes.partitionAttributes != null) {
       if (!PartitionedRegionHelper.ALLOWED_DATA_POLICIES.contains(dataPolicy)) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_DATA_POLICIES_OTHER_THAN_0_ARE_NOT_SUPPORTED_FOR_PARTITIONED_REGIONS
-                .toLocalizedString(PartitionedRegionHelper.ALLOWED_DATA_POLICIES));
+            String.format("Data policies other than %s are not supported for Partitioned Regions",
+                PartitionedRegionHelper.ALLOWED_DATA_POLICIES));
       }
     }
     this.regionAttributes.setDataPolicy(dataPolicy);
@@ -715,8 +712,7 @@ public class AttributesFactory<K, V> {
   public void setKeyConstraint(Class<K> keyConstraint) {
     if (keyConstraint != null && keyConstraint.isPrimitive())
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_KEYCONSTRAINT_MUST_NOT_BE_A_PRIMITIVE_TYPE
-              .toLocalizedString());
+          "keyConstraint must not be a primitive type");
     this.regionAttributes.keyConstraint = keyConstraint;
     this.regionAttributes.setHasKeyConstraint(true);
   }
@@ -733,8 +729,7 @@ public class AttributesFactory<K, V> {
   public void setValueConstraint(Class<V> valueConstraint) {
     if (valueConstraint != null && valueConstraint.isPrimitive())
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_VALUECONSTRAINT_MUST_NOT_BE_A_PRIMITIVE_TYPE
-              .toLocalizedString());
+          "valueConstraint must not be a primitive type");
     this.regionAttributes.valueConstraint = valueConstraint;
     this.regionAttributes.setHasValueConstraint(true);
   }
@@ -753,7 +748,7 @@ public class AttributesFactory<K, V> {
   public void setInitialCapacity(int initialCapacity) {
     if (initialCapacity < 0)
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_INITIALCAPACITY_MUST_BE_0.toLocalizedString());
+          "initialCapacity must be >= 0");
     this.regionAttributes.initialCapacity = initialCapacity;
     this.regionAttributes.setHasInitialCapacity(true);
   }
@@ -769,8 +764,8 @@ public class AttributesFactory<K, V> {
   public void setLoadFactor(float loadFactor) {
     if (loadFactor <= 0)
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_LOADFACTOR_MUST_BE_0_VALUE_IS_0
-              .toLocalizedString(new Float(loadFactor)));
+          String.format("loadFactor must be > 0, value is %s",
+              new Float(loadFactor)));
     this.regionAttributes.loadFactor = loadFactor;
     this.regionAttributes.setHasLoadFactor(true);
   }
@@ -785,7 +780,7 @@ public class AttributesFactory<K, V> {
   public void setConcurrencyLevel(int concurrencyLevel) {
     if (concurrencyLevel <= 0)
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_CONCURRENCYLEVEL_MUST_BE_0.toLocalizedString());
+          "concurrencyLevel must be > 0");
     this.regionAttributes.concurrencyLevel = concurrencyLevel;
     this.regionAttributes.setHasConcurrencyLevel(true);
   }
@@ -882,7 +877,7 @@ public class AttributesFactory<K, V> {
   public void addGatewaySenderId(String gatewaySenderId) {
     if (gatewaySenderId == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_GATEWAY_SENDER_ID_IS_NULL.toLocalizedString());
+          "GatewaySender id is null.");
     }
     synchronized (this.regionAttributes) {
       this.regionAttributes.addGatewaySenderId(gatewaySenderId);
@@ -898,7 +893,7 @@ public class AttributesFactory<K, V> {
   public void addAsyncEventQueueId(String asyncEventQueueId) {
     if (asyncEventQueueId == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_GATEWAY_SENDER_ID_IS_NULL.toLocalizedString());
+          "GatewaySender id is null.");
     }
     synchronized (this.regionAttributes) {
       this.regionAttributes.addAsyncEventQueueId(asyncEventQueueId);
@@ -940,7 +935,7 @@ public class AttributesFactory<K, V> {
   public void setDiskWriteAttributes(DiskWriteAttributes attrs) {
     if (this.regionAttributes.getDiskStoreName() != null) {
       throw new IllegalStateException(
-          LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1.toLocalizedString(
+          String.format("Deprecated API %s cannot be used with DiskStore %s",
               new Object[] {"setDiskWriteAttributes", this.regionAttributes.getDiskStoreName()}));
     }
     this.regionAttributes.diskWriteAttributes = attrs;
@@ -963,7 +958,7 @@ public class AttributesFactory<K, V> {
   public void setDiskDirs(File[] diskDirs) {
     if (this.regionAttributes.getDiskStoreName() != null) {
       throw new IllegalStateException(
-          LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1.toLocalizedString(
+          String.format("Deprecated API %s cannot be used with DiskStore %s",
               new Object[] {"setDiskDirs", this.regionAttributes.getDiskStoreName()}));
     }
     DiskStoreFactoryImpl.checkIfDirectoriesExist(diskDirs);
@@ -990,8 +985,8 @@ public class AttributesFactory<K, V> {
   public void setDiskStoreName(String name) {
     if (this.regionAttributes.hasDiskDirs() || this.regionAttributes.hasDiskWriteAttributes()) {
       throw new IllegalStateException(
-          LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
-              .toLocalizedString(new Object[] {"setDiskDirs or setDiskWriteAttributes", name}));
+          String.format("Deprecated API %s cannot be used with DiskStore %s",
+              new Object[] {"setDiskDirs or setDiskWriteAttributes", name}));
     }
     this.regionAttributes.diskStoreName = name;
     this.regionAttributes.setHasDiskStoreName(true);
@@ -1038,15 +1033,16 @@ public class AttributesFactory<K, V> {
   public void setDiskDirsAndSizes(File[] diskDirs, int[] diskSizes) {
     if (this.regionAttributes.getDiskStoreName() != null) {
       throw new IllegalStateException(
-          LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1.toLocalizedString(
+          String.format("Deprecated API %s cannot be used with DiskStore %s",
               new Object[] {"setDiskDirsAndSizes", this.regionAttributes.getDiskStoreName()}));
     }
     DiskStoreFactoryImpl.checkIfDirectoriesExist(diskDirs);
     this.regionAttributes.diskDirs = diskDirs;
     if (diskSizes.length != this.regionAttributes.diskDirs.length) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AttributesFactory_NUMBER_OF_DISKSIZES_IS_0_WHICH_IS_NOT_EQUAL_TO_NUMBER_OF_DISK_DIRS_WHICH_IS_1
-              .toLocalizedString(new Object[] {Integer.valueOf(diskSizes.length),
+          String.format(
+              "Number of diskSizes is %s which is not equal to number of disk Dirs which is %s",
+              new Object[] {Integer.valueOf(diskSizes.length),
                   Integer.valueOf(diskDirs.length)}));
     }
     DiskStoreFactoryImpl.verifyNonNegativeDirSize(diskSizes);
@@ -1074,8 +1070,9 @@ public class AttributesFactory<K, V> {
       } else if (!PartitionedRegionHelper.ALLOWED_DATA_POLICIES
           .contains(this.regionAttributes.dataPolicy)) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_DATA_POLICY_0_IS_NOT_ALLOWED_FOR_A_PARTITIONED_REGION_DATAPOLICIES_OTHER_THAN_1_ARE_NOT_ALLOWED
-                .toLocalizedString(new Object[] {this.regionAttributes.dataPolicy,
+            String.format(
+                "Data policy %s is not allowed for a partitioned region. DataPolicies other than %s are not allowed.",
+                new Object[] {this.regionAttributes.dataPolicy,
                     PartitionedRegionHelper.ALLOWED_DATA_POLICIES}));
       }
       if (this.regionAttributes.hasPartitionAttributes()
@@ -1360,28 +1357,24 @@ public class AttributesFactory<K, V> {
         if (idleAction == ExpirationAction.LOCAL_DESTROY
             || ttlAction == ExpirationAction.LOCAL_DESTROY) {
           throw new IllegalStateException(
-              LocalizedStrings.AttributesFactory_EXPIRATIONACTIONLOCAL_DESTROY_ON_THE_ENTRIES_IS_INCOMPATIBLE_WITH_DISTRIBUTED_REPLICATION
-                  .toLocalizedString());
+              "ExpirationAction.LOCAL_DESTROY on the entries is incompatible with distributed replication");
         }
 
         if (attrs.getEvictionAttributes().getAction().isLocalDestroy()) {
           throw new IllegalStateException(
-              LocalizedStrings.AttributesFactory_AN_EVICTION_CONTROLLER_WITH_LOCAL_DESTROY_EVICTION_ACTION_IS_INCOMPATIBLE_WITH_DISTRIBUTED_REPLICATION
-                  .toLocalizedString());
+              "An Eviction Controller with local destroy eviction action is incompatible with distributed replication");
         }
 
         if (attrs.getRegionIdleTimeout().getAction() == ExpirationAction.LOCAL_INVALIDATE
             || attrs.getRegionTimeToLive().getAction() == ExpirationAction.LOCAL_INVALIDATE) {
           throw new IllegalStateException(
-              LocalizedStrings.AttributesFactory_EXPIRATIONACTIONLOCAL_INVALIDATE_ON_THE_REGION_IS_INCOMPATIBLE_WITH_DISTRIBUTED_REPLICATION
-                  .toLocalizedString());
+              "ExpirationAction.LOCAL_INVALIDATE on the region is incompatible with distributed replication");
         }
 
         if (idleAction == ExpirationAction.LOCAL_INVALIDATE
             || ttlAction == ExpirationAction.LOCAL_INVALIDATE) {
           throw new IllegalStateException(
-              LocalizedStrings.AttributesFactory_EXPIRATIONACTIONLOCAL_INVALIDATE_ON_THE_ENTRIES_IS_INCOMPATIBLE_WITH_DISTRIBUTED_REPLICATION
-                  .toLocalizedString());
+              "ExpirationAction.LOCAL_INVALIDATE on the entries is incompatible with distributed replication");
         }
       }
     }
@@ -1391,7 +1384,7 @@ public class AttributesFactory<K, V> {
       if (!attrs.getDataPolicy().withPersistence()
           && (ea != null && ea.getAction() != EvictionAction.OVERFLOW_TO_DISK)) {
         throw new IllegalStateException(
-            LocalizedStrings.DiskStore_IS_USED_IN_NONPERSISTENT_REGION.toLocalizedString());
+            "Only regions with persistence or overflow to disk can specify DiskStore");
       }
     }
 
@@ -1401,8 +1394,7 @@ public class AttributesFactory<K, V> {
         || attrs.getEntryIdleTimeout().getTimeout() != 0
         || attrs.getCustomEntryIdleTimeout() != null || attrs.getCustomEntryTimeToLive() != null)) {
       throw new IllegalStateException(
-          LocalizedStrings.AttributesFactory_STATISTICS_MUST_BE_ENABLED_FOR_EXPIRATION
-              .toLocalizedString());
+          "Statistics must be enabled for expiration");
     }
 
     if (attrs.getDataPolicy() == DataPolicy.EMPTY) {
@@ -1411,20 +1403,19 @@ public class AttributesFactory<K, V> {
           || attrs.getCustomEntryTimeToLive() != null
           || attrs.getCustomEntryIdleTimeout() != null) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_IF_THE_DATA_POLICY_IS_0_THEN_ENTRY_EXPIRATION_IS_NOT_ALLOWED
-                .toLocalizedString(attrs.getDataPolicy()));
+            String.format("If the data policy is %s then entry expiration is not allowed.",
+                attrs.getDataPolicy()));
       }
       if (!attrs.getEvictionAttributes().getAlgorithm().isNone()) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_IF_THE_DATA_POLICY_IS_0_THEN_EVICTION_IS_NOT_ALLOWED
-                .toLocalizedString(attrs.getDataPolicy()));
+            String.format("If the data policy is %s then eviction is not allowed.",
+                attrs.getDataPolicy()));
       }
     }
     if (attrs.getMembershipAttributes().hasRequiredRoles()) {
       if (attrs.getScope().isLocal()) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_IF_THE_MEMBERSHIP_ATTRIBUTES_HAS_REQUIRED_ROLES_THEN_SCOPE_MUST_NOT_BE_LOCAL
-                .toLocalizedString());
+            "If the membership attributes has required roles then scope must not be LOCAL.");
       }
     }
 
@@ -1443,23 +1434,20 @@ public class AttributesFactory<K, V> {
       if ((entryIdleTimeout.getAction().isLocalDestroy() && entryIdleTimeout.getTimeout() > 0)
           || (entryTimeToLive.getAction().isLocalDestroy() && entryTimeToLive.getTimeout() > 0)) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_LOCAL_DESTROY_IS_NOT_SUPPORTED_FOR_PR
-                .toLocalizedString());
+            "ExpirationAction LOCAL_DESTROY is not supported for Partitioned Region.");
       }
       if ((entryIdleTimeout.getAction().isLocalInvalidate() && entryIdleTimeout.getTimeout() > 0)
           || (entryTimeToLive.getAction().isLocalInvalidate()
               && entryTimeToLive.getTimeout() > 0)) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_LOCAL_INVALIDATE_IS_NOT_SUPPORTED_FOR_PR
-                .toLocalizedString());
+            "ExpirationAction LOCAL_INVALIDATE is not supported for Partitioned Region.");
       }
 
       if (attrs instanceof UserSpecifiedRegionAttributes<?, ?>) {
         UserSpecifiedRegionAttributes<?, ?> rac = (UserSpecifiedRegionAttributes<?, ?>) attrs;
         if (rac.hasScope()) {
           throw new IllegalStateException(
-              LocalizedStrings.AttributesFactory_SETTING_SCOPE_ON_A_PARTITIONED_REGIONS_IS_NOT_ALLOWED
-                  .toLocalizedString());
+              "Setting Scope on a Partitioned Regions is not allowed.");
         }
       }
 
@@ -1468,26 +1456,23 @@ public class AttributesFactory<K, V> {
       }
       if (pa.getTotalMaxMemory() <= 0) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_TOTAL_SIZE_OF_PARTITION_REGION_MUST_BE_0
-                .toLocalizedString());
+            "Total size of partition region must be > 0.");
       }
 
       if (!PartitionedRegionHelper.ALLOWED_DATA_POLICIES.contains(attrs.getDataPolicy())) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_DATA_POLICIES_OTHER_THAN_0_ARE_NOT_ALLOWED_IN_PARTITIONED_REGIONS
-                .toLocalizedString(PartitionedRegionHelper.ALLOWED_DATA_POLICIES));
+            String.format("Data policies other than %s are not allowed in  partitioned regions.",
+                PartitionedRegionHelper.ALLOWED_DATA_POLICIES));
       }
       // fix bug #52033 by invoking getLocalMaxMemoryForValidation here
       if (((PartitionAttributesImpl) pa).getLocalMaxMemoryForValidation() < 0) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_PARTITIONATTRIBUTES_LOCALMAXMEMORY_MUST_NOT_BE_NEGATIVE
-                .toLocalizedString());
+            "PartitionAttributes localMaxMemory must not be negative.");
       }
 
       if (attrs.isLockGrantor() == true) {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_SETLOCKGRANTERTRUE_IS_NOT_ALLOWED_IN_PARTITIONED_REGIONS
-                .toLocalizedString());
+            "setLockGranter(true) is not allowed in Partitioned Regions.");
       }
 
       // fix bug #52033 by invoking getLocalMaxMemoryForValidation here
@@ -1661,8 +1646,8 @@ public class AttributesFactory<K, V> {
         return MirrorType.KEYS_VALUES;
       } else {
         throw new IllegalStateException(
-            LocalizedStrings.AttributesFactory_NO_MIRROR_TYPE_CORRESPONDS_TO_DATA_POLICY_0
-                .toLocalizedString(this.dataPolicy));
+            String.format("No mirror type corresponds to data policy %s.",
+                this.dataPolicy));
       }
     }
 
@@ -1718,8 +1703,7 @@ public class AttributesFactory<K, V> {
         }
       }
       throw new IllegalStateException(
-          LocalizedStrings.AttributesFactory_MORE_THAN_ONE_CACHE_LISTENER_EXISTS
-              .toLocalizedString());
+          "More than one cache listener exists.");
     }
 
     protected void addCacheListener(CacheListener<K, V> aListener) {
@@ -1746,8 +1730,8 @@ public class AttributesFactory<K, V> {
           // above code
           if (this.gatewaySenderIds.contains(gatewaySenderId)) {
             throw new IllegalArgumentException(
-                LocalizedStrings.AttributesFactory_GATEWAY_SENDER_ID_0_IS_ALREADY_ADDED
-                    .toLocalizedString(gatewaySenderId));
+                String.format("gateway-sender-id %s is already added",
+                    gatewaySenderId));
           }
           this.gatewaySenderIds.add(gatewaySenderId);
         }
@@ -1765,8 +1749,8 @@ public class AttributesFactory<K, V> {
           // above code
           if (this.asyncEventQueueIds.contains(asyncEventQueueId)) {
             throw new IllegalArgumentException(
-                LocalizedStrings.AttributesFactory_ASYNC_EVENT_QUEUE_ID_0_IS_ALREADY_ADDED
-                    .toLocalizedString(asyncEventQueueId));
+                String.format("async-event-queue-id %s is already added",
+                    asyncEventQueueId));
           }
           this.asyncEventQueueIds.add(asyncEventQueueId);
         }
@@ -1825,8 +1809,7 @@ public class AttributesFactory<K, V> {
         return copy;
       } catch (CloneNotSupportedException e) {
         throw new InternalError(
-            LocalizedStrings.AttributesFactory_CLONENOTSUPPORTEDEXCEPTION_THROWN_IN_CLASS_THAT_IMPLEMENTS_CLONEABLE
-                .toLocalizedString());
+            "CloneNotSupportedException thrown in class that implements cloneable.");
       }
     }
 
@@ -1869,8 +1852,8 @@ public class AttributesFactory<K, V> {
     public DiskWriteAttributes getDiskWriteAttributes() {
       if (this.diskStoreName != null) {
         throw new IllegalStateException(
-            LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
-                .toLocalizedString(new Object[] {"getDiskWriteAttributes", this.diskStoreName}));
+            String.format("Deprecated API %s cannot be used with DiskStore %s",
+                new Object[] {"getDiskWriteAttributes", this.diskStoreName}));
       }
       return this.diskWriteAttributes;
     }
@@ -1882,8 +1865,8 @@ public class AttributesFactory<K, V> {
     public File[] getDiskDirs() {
       if (this.diskStoreName != null) {
         throw new IllegalStateException(
-            LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
-                .toLocalizedString(new Object[] {"getDiskDirs", this.diskStoreName}));
+            String.format("Deprecated API %s cannot be used with DiskStore %s",
+                new Object[] {"getDiskDirs", this.diskStoreName}));
       }
       return this.diskDirs;
     }
@@ -1919,8 +1902,8 @@ public class AttributesFactory<K, V> {
     public int[] getDiskDirSizes() {
       if (this.diskStoreName != null) {
         throw new IllegalStateException(
-            LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
-                .toLocalizedString(new Object[] {"getDiskDirSizes", this.diskStoreName}));
+            String.format("Deprecated API %s cannot be used with DiskStore %s",
+                new Object[] {"getDiskDirSizes", this.diskStoreName}));
       }
       return this.diskSizes;
     }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index 4491f27..38c5265 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -27,7 +27,6 @@ import org.apache.geode.internal.cache.CacheConfig;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.PdxSerializer;
 import org.apache.geode.security.AuthenticationFailedException;
@@ -290,16 +289,15 @@ public class CacheFactory {
     InternalCache instance = GemFireCacheImpl.getInstance();
     if (instance == null) {
       throw new CacheClosedException(
-          LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED.toLocalizedString());
+          "A cache has not yet been created.");
     } else {
       if (instance.isClosed() && !closeOk) {
         throw instance.getCacheClosedException(
-            LocalizedStrings.CacheFactory_THE_CACHE_HAS_BEEN_CLOSED.toLocalizedString(), null);
+            "The cache has been closed.", null);
       }
       if (!instance.getDistributedSystem().equals(system)) {
         throw instance.getCacheClosedException(
-            LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED_FOR_THE_GIVEN_DISTRIBUTED_SYSTEM
-                .toLocalizedString());
+            "A cache has not yet been created for the given distributed system.");
       }
       return instance;
     }
@@ -324,7 +322,7 @@ public class CacheFactory {
     InternalCache instance = GemFireCacheImpl.getInstance();
     if (instance == null) {
       throw new CacheClosedException(
-          LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED.toLocalizedString());
+          "A cache has not yet been created.");
     } else {
       instance.getCancelCriterion().checkCancelInProgress(null);
       return instance;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java b/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
index 69620fe..d8b793e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
@@ -18,7 +18,6 @@ package org.apache.geode.cache;
 
 import java.io.ObjectStreamException;
 
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Enumerated type for region data policy. The data policy specifies how this local cache will
@@ -127,13 +126,13 @@ public class DataPolicy implements java.io.Serializable {
   private DataPolicy(int ordinal, String name) {
     if (ordinal >= VALUES.length) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DataPolicy_ONLY_0_DATAPOLICIES_MAY_BE_DEFINED
-              .toLocalizedString(Integer.valueOf(VALUES.length + 1)));
+          String.format("Only %s DataPolicies may be defined",
+              Integer.valueOf(VALUES.length + 1)));
     }
     if (VALUES[ordinal] != null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DataPolicy_ORDINAL_0_IS_ALREADY_DEFINED_BY_1
-              .toLocalizedString(new Object[] {Integer.valueOf(ordinal), VALUES[ordinal]}));
+          String.format("Ordinal %s is already defined by  %s",
+              new Object[] {Integer.valueOf(ordinal), VALUES[ordinal]}));
     }
     this.name = name;
     this.ordinal = (byte) (ordinal & 0xff);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
index 97d3d51..e1a0713 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
@@ -18,7 +18,6 @@ import java.util.Properties;
 
 import org.apache.geode.internal.cache.DiskWriteAttributesImpl;
 import org.apache.geode.internal.cache.xmlcache.CacheXml;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Factory for getting DiskWriteAttribute objects
@@ -116,13 +115,14 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
   public void setCompactionThreshold(int compactionThreshold) {
     if (compactionThreshold < 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DiskWriteAttributesImpl_0_HAS_TO_BE_POSITIVE_NUMBER_AND_THE_VALUE_GIVEN_1_IS_NOT_ACCEPTABLE
-              .toLocalizedString(new Object[] {CacheXml.COMPACTION_THRESHOLD,
+          String.format("%s has to be positive number and the value given %s is not acceptable",
+              new Object[] {CacheXml.COMPACTION_THRESHOLD,
                   Integer.valueOf(compactionThreshold)}));
     } else if (compactionThreshold > 100) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DiskWriteAttributesImpl_0_HAS_TO_BE_LESS_THAN_2_BUT_WAS_1
-              .toLocalizedString(new Object[] {CacheXml.COMPACTION_THRESHOLD,
+          String.format(
+              "%s has to be a number that does not exceed %s so the value given %s is not acceptable",
+              new Object[] {CacheXml.COMPACTION_THRESHOLD,
                   Integer.valueOf(compactionThreshold), Integer.valueOf(100)}));
     }
     this.props.setProperty(CacheXml.COMPACTION_THRESHOLD, String.valueOf(compactionThreshold));
@@ -144,8 +144,9 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
 
     if (maxOplogSize < 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DiskWriteAttributesFactory_MAXIMUM_OPLOG_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE
-              .toLocalizedString(Long.valueOf(maxOplogSize)));
+          String.format(
+              "Maximum Oplog size specified has to be a non-negative number and the value given  %s  is not acceptable",
+              Long.valueOf(maxOplogSize)));
     }
     this.props.setProperty(CacheXml.MAX_OPLOG_SIZE, String.valueOf(maxOplogSize));
   }
@@ -166,8 +167,9 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
 
     if (maxOplogSize < 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DiskWriteAttributesFactory_MAXIMUM_OPLOG_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE
-              .toLocalizedString(Integer.valueOf(maxOplogSize)));
+          String.format(
+              "Maximum Oplog size specified has to be a non-negative number and the value given  %s  is not acceptable",
+              Integer.valueOf(maxOplogSize)));
     }
     long maxOplogSizeInBytes = convertToBytes(maxOplogSize);
     this.props.setProperty(CacheXml.MAX_OPLOG_SIZE, String.valueOf(maxOplogSizeInBytes));
@@ -197,8 +199,9 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
   public void setTimeInterval(long timeInterval) {
     if (timeInterval < 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DiskWriteAttributesFactory_TIME_INTERVAL_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE
-              .toLocalizedString(Long.valueOf(timeInterval)));
+          String.format(
+              "Time Interval specified has to be a non-negative number and the value given  %s  is not acceptable",
+              Long.valueOf(timeInterval)));
     }
 
     this.props.setProperty(CacheXml.TIME_INTERVAL, String.valueOf(timeInterval));
@@ -216,8 +219,9 @@ public class DiskWriteAttributesFactory implements java.io.Serializable {
   public void setBytesThreshold(long bytesThreshold) {
     if (bytesThreshold < 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.DiskWriteAttributesFactory_QUEUE_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE
-              .toLocalizedString(Long.valueOf(bytesThreshold)));
+          String.format(
+              "Queue size specified has to be a non-negative number and the value given %s is not acceptable",
+              Long.valueOf(bytesThreshold)));
     }
 
     this.props.setProperty(CacheXml.BYTES_THRESHOLD, String.valueOf(bytesThreshold));
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
index a4c4204..9e57819 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
@@ -46,7 +46,6 @@ import org.apache.geode.internal.cache.InternalRegionArguments;
 import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.cache.RegionEventImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.security.GemFireSecurityException;
 
 /**
@@ -294,29 +293,29 @@ public abstract class DynamicRegionFactory {
         } catch (IOException e) {
           // only if loading snapshot, not here
           throw new InternalGemFireError(
-              LocalizedStrings.DynamicRegionFactory_UNEXPECTED_EXCEPTION.toLocalizedString(), e);
+              "unexpected exception", e);
         } catch (ClassNotFoundException e) {
           // only if loading snapshot, not here
           throw new InternalGemFireError(
-              LocalizedStrings.DynamicRegionFactory_UNEXPECTED_EXCEPTION.toLocalizedString(), e);
+              "unexpected exception", e);
         }
         if (isClient) {
           this.dynamicRegionList.registerInterest("ALL_KEYS");
         }
-        if (theCache.getLoggerI18n().fineEnabled()) {
-          theCache.getLoggerI18n().fine("Created dynamic region: " + this.dynamicRegionList);
+        if (theCache.getLogger().fineEnabled()) {
+          theCache.getLogger().fine("Created dynamic region: " + this.dynamicRegionList);
         }
       } else {
-        if (theCache.getLoggerI18n().fineEnabled()) {
-          theCache.getLoggerI18n().fine("Retrieved dynamic region: " + this.dynamicRegionList);
+        if (theCache.getLogger().fineEnabled()) {
+          theCache.getLogger().fine("Retrieved dynamic region: " + this.dynamicRegionList);
         }
       }
 
       createDefinedDynamicRegions();
 
     } catch (CacheException e) {
-      theCache.getLoggerI18n().warning(
-          LocalizedStrings.DynamicRegionFactory_ERROR_INITIALIZING_DYNAMICREGIONFACTORY, e);
+      theCache.getLogger().warning(
+          "Error initializing DynamicRegionFactory", e);
       throw e;
     }
   }
@@ -407,9 +406,9 @@ public abstract class DynamicRegionFactory {
         // error condition, so you also need to check to see if the JVM
         // is still usable:
         SystemFailure.checkFailure();
-        this.cache.getLoggerI18n().warning(
-            LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_BEFOREREGIONCREATED,
-            listener, t);
+        this.cache.getLogger().warning(
+            String.format("DynamicRegionListener %s threw exception on beforeRegionCreated",
+                listener, t));
       }
     }
   }
@@ -434,9 +433,9 @@ public abstract class DynamicRegionFactory {
         // error condition, so you also need to check to see if the JVM
         // is still usable:
         SystemFailure.checkFailure();
-        this.cache.getLoggerI18n().warning(
-            LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_AFTERREGIONCREATED,
-            listener, t);
+        this.cache.getLogger().warning(
+            String.format("DynamicRegionListener %s threw exception on afterRegionCreated",
+                listener, t));
       }
     }
   }
@@ -466,9 +465,9 @@ public abstract class DynamicRegionFactory {
         // error condition, so you also need to check to see if the JVM
         // is still usable:
         SystemFailure.checkFailure();
-        this.cache.getLoggerI18n().warning(
-            LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_BEFOREREGIONDESTROYED,
-            listener, t);
+        this.cache.getLogger().warning(
+            String.format("DynamicRegionListener %s threw exception on beforeRegionDestroyed",
+                listener, t));
       }
     }
   }
@@ -498,9 +497,9 @@ public abstract class DynamicRegionFactory {
         // error condition, so you also need to check to see if the JVM
         // is still usable:
         SystemFailure.checkFailure();
-        this.cache.getLoggerI18n().warning(
-            LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_AFTERREGIONDESTROYED,
-            listener, t);
+        this.cache.getLogger().warning(
+            String.format("DynamicRegionListener %s threw exception on afterRegionDestroyed",
+                listener, t));
       }
     }
   }
@@ -542,8 +541,8 @@ public abstract class DynamicRegionFactory {
   public void destroyDynamicRegion(String fullRegionName) throws CacheException {
     if (!this.dynamicRegionList.containsKey(fullRegionName)) {
       throw new RegionDestroyedException(
-          LocalizedStrings.DynamicRegionFactory_DYNAMIC_REGION_0_HAS_NOT_BEEN_CREATED
-              .toLocalizedString(fullRegionName),
+          String.format("Dynamic region %s has not been created.",
+              fullRegionName),
           fullRegionName);
     }
     if (isClosed()) {
@@ -573,12 +572,12 @@ public abstract class DynamicRegionFactory {
 
     if (parentRegion == null) {
       String errMsg =
-          LocalizedStrings.DynamicRegionFactory_ERROR__COULD_NOT_FIND_A_REGION_NAMED___0_
-              .toLocalizedString(parentRegionName);
+          String.format("Error -- Could not find a region named: '%s'",
+              parentRegionName);
       RegionDestroyedException e = new RegionDestroyedException(errMsg, parentRegionName);
-      this.cache.getLoggerI18n().warning(
-          LocalizedStrings.DynamicRegionFactory_ERROR__COULD_NOT_FIND_A_REGION_NAMED___0_,
-          parentRegionName, e);
+      this.cache.getLogger().warning(
+          String.format("Error -- Could not find a region named: '%s'",
+              parentRegionName, e));
       throw e;
     }
 
@@ -604,10 +603,10 @@ public abstract class DynamicRegionFactory {
     Region newRegion;
     try {
       newRegion = parentRegion.createSubregion(newRegionName, newRegionAttributes);
-      this.cache.getLoggerI18n().fine("Created dynamic region " + newRegion);
+      this.cache.getLogger().fine("Created dynamic region " + newRegion);
     } catch (RegionExistsException ex) {
       // a race condition exists that can cause this so just fine log it
-      this.cache.getLoggerI18n().fine(
+      this.cache.getLogger().fine(
           "DynamicRegion " + newRegionName + " in parent " + parentRegionName + " already existed");
       newRegion = ex.getRegion();
     }
@@ -616,8 +615,8 @@ public abstract class DynamicRegionFactory {
       DynamicRegionAttributes dra = new DynamicRegionAttributes();
       dra.name = newRegionName;
       dra.rootRegionName = parentRegion.getFullPath();
-      if (this.cache.getLoggerI18n().fineEnabled()) {
-        this.cache.getLoggerI18n()
+      if (this.cache.getLogger().fineEnabled()) {
+        this.cache.getLogger()
             .fine("Putting entry into dynamic region list at key: " + newRegion.getFullPath());
       }
       this.dynamicRegionList.put(newRegion.getFullPath(), dra);
@@ -631,9 +630,10 @@ public abstract class DynamicRegionFactory {
             newRegion.registerInterest("ALL_KEYS");
           } catch (GemFireSecurityException ex) {
             // Ignore security exceptions here
-            this.cache.getSecurityLoggerI18n().warning(
-                LocalizedStrings.DynamicRegionFactory_EXCEPTION_WHEN_REGISTERING_INTEREST_FOR_ALL_KEYS_IN_DYNAMIC_REGION_0_1,
-                new Object[] {newRegion.getFullPath(), ex});
+            this.cache.getSecurityLogger().warning(
+                String.format(
+                    "Exception when registering interest for all keys in dynamic region [%s]. %s",
+                    new Object[] {newRegion.getFullPath(), ex}));
           }
         }
       }
@@ -647,8 +647,8 @@ public abstract class DynamicRegionFactory {
       }
     }
 
-    if (this.cache.getLoggerI18n().fineEnabled()) {
-      this.cache.getLoggerI18n().fine("Created Dynamic Region " + newRegion.getFullPath());
+    if (this.cache.getLogger().fineEnabled()) {
+      this.cache.getLogger().fine("Created Dynamic Region " + newRegion.getFullPath());
     }
     return newRegion;
   }
@@ -656,20 +656,20 @@ public abstract class DynamicRegionFactory {
   private void destroyDynamicRegionImpl(String fullRegionName) throws CacheException {
     // Destroy the entry in the dynamicRegionList
     try {
-      if (this.cache.getLoggerI18n().fineEnabled()) {
-        this.cache.getLoggerI18n()
+      if (this.cache.getLogger().fineEnabled()) {
+        this.cache.getLogger()
             .fine("Destroying entry from dynamic region list at key: " + fullRegionName);
       }
       this.dynamicRegionList.destroy(fullRegionName);
     } catch (CacheException e) {
-      this.cache.getLoggerI18n().warning(
-          LocalizedStrings.DynamicRegionFactory_ERROR_DESTROYING_DYNAMIC_REGION__0, fullRegionName,
-          e);
+      this.cache.getLogger().warning(
+          String.format("Error destroying Dynamic Region '%s'", fullRegionName,
+              e));
       throw e;
     }
 
-    if (this.cache.getLoggerI18n().fineEnabled()) {
-      this.cache.getLoggerI18n().fine("Destroyed Dynamic Region " + fullRegionName);
+    if (this.cache.getLogger().fineEnabled()) {
+      this.cache.getLogger().fine("Destroyed Dynamic Region " + fullRegionName);
     }
   }
 
@@ -826,9 +826,9 @@ public abstract class DynamicRegionFactory {
       Region region = createDynamicRegionImpl(parentRegionName, newRegionName, false);
       doAfterRegionCreated(region, true, true, event.getDistributedMember());
     } catch (Exception e) {
-      cache.getLoggerI18n().warning(
-          LocalizedStrings.DynamicRegionFactory_ERROR_ATTEMPTING_TO_LOCALLY_CREATE_DYNAMIC_REGION__0,
-          newRegionName, e);
+      cache.getLogger().warning(
+          String.format("Error attempting to locally create Dynamic Region: %s",
+              newRegionName, e));
     }
   }
 
@@ -854,9 +854,9 @@ public abstract class DynamicRegionFactory {
         doAfterRegionDestroyed(drRegion, true, event.getOperation().isDistributed(),
             event.getOperation().isExpiration(), event.getDistributedMember());
       } catch (Exception e) {
-        cache.getLoggerI18n().warning(
-            LocalizedStrings.DynamicRegionFactory_ERROR_ATTEMPTING_TO_LOCALLY_DESTROY_DYNAMIC_REGION__0,
-            fullRegionName, e);
+        cache.getLogger().warning(
+            String.format("Error attempting to locally destroy Dynamic Region: %s",
+                fullRegionName, e));
       }
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/LossAction.java b/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
index 5ad3fb7..82f906a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
@@ -20,7 +20,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Specifies how access to the region is affected when one or more required roles are lost. A role
@@ -98,7 +97,7 @@ public class LossAction implements Serializable {
   public static LossAction fromName(String name) {
     if (name == null || name.length() == 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.LossAction_INVALID_LOSSACTION_NAME_0.toLocalizedString(name));
+          String.format("Invalid LossAction name:  %s", name));
     }
     for (int i = 0; i < PRIVATE_VALUES.length; i++) {
       if (name.equals(PRIVATE_VALUES[i].name)) {
@@ -106,7 +105,7 @@ public class LossAction implements Serializable {
       }
     }
     throw new IllegalArgumentException(
-        LocalizedStrings.LossAction_INVALID_LOSSACTION_NAME_0.toLocalizedString(name));
+        String.format("Invalid LossAction name:  %s", name));
   }
 
   /** Returns true if this is <code>NO_ACCESS</code>. */
diff --git a/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
index 2135c58..cb69364 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
@@ -29,7 +29,6 @@ import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.Role;
 import org.apache.geode.distributed.internal.membership.InternalRole;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Configuration attributes for defining reliability requirements and behavior for a
@@ -114,8 +113,7 @@ public class MembershipAttributes implements DataSerializable, Externalizable {
     this.requiredRoles = toRoleSet(requiredRoles);
     if (this.requiredRoles.isEmpty()) {
       throw new IllegalArgumentException(
-          LocalizedStrings.MembershipAttributes_ONE_OR_MORE_REQUIRED_ROLES_MUST_BE_SPECIFIED
-              .toLocalizedString());
+          "One or more required roles must be specified.");
     }
     this.lossAction = lossAction;
     this.resumptionAction = resumptionAction;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributesFactory.java
index d7d74b3..198e557 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributesFactory.java
@@ -19,7 +19,6 @@ import java.util.Properties;
 
 import org.apache.geode.cache.partition.PartitionListener;
 import org.apache.geode.internal.cache.PartitionAttributesImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * <p>
@@ -273,8 +272,7 @@ public class PartitionAttributesFactory<K, V> {
   public PartitionAttributesFactory<K, V> addPartitionListener(PartitionListener listener) {
     if (listener == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.PartitionAttributesFactory_PARTITION_LISTENER_PARAMETER_WAS_NULL
-              .toLocalizedString());
+          "PartitionListner parameter was null");
     }
     synchronized (this.partitionAttributes) {
       this.partitionAttributes.addPartitionListener(listener);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/RegionFactory.java
index d8cade6..543e280 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionFactory.java
@@ -22,7 +22,6 @@ import org.apache.geode.compression.Compressor;
 import org.apache.geode.distributed.LeaseExpiredException;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * {@code RegionFactory} is used to create {@link Region regions} in a {@link Cache cache}.
@@ -110,8 +109,8 @@ public class RegionFactory<K, V> {
     this.cache = cache;
     RegionAttributes<K, V> ra = getCache().getRegionAttributes(regionAttributesId);
     if (ra == null) {
-      throw new IllegalStateException(LocalizedStrings.RegionFactory_NO_ATTRIBUTES_ASSOCIATED_WITH_0
-          .toLocalizedString(regionAttributesId));
+      throw new IllegalStateException(String.format("No attributes associated with  %s",
+          regionAttributesId));
     }
     this.attrsFactory = new AttributesFactory<K, V>(ra);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RequiredRoles.java b/geode-core/src/main/java/org/apache/geode/cache/RequiredRoles.java
index bd8bc4d..72d9ef6 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RequiredRoles.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RequiredRoles.java
@@ -21,7 +21,6 @@ import org.apache.geode.distributed.Role;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.cache.DistributedRegion;
 import org.apache.geode.internal.cache.InternalRegion;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Provides information on presence or absence of a <code>Region</code>'s required roles.
@@ -77,12 +76,11 @@ public class RequiredRoles {
       throws InterruptedException {
     if (region == null) {
       throw new NullPointerException(
-          LocalizedStrings.RequiredRoles_REGION_MUST_BE_SPECIFIED.toLocalizedString());
+          "Region must be specified");
     }
     if (!(region instanceof DistributedRegion)) {
       throw new IllegalStateException(
-          LocalizedStrings.RequiredRoles_REGION_HAS_NOT_BEEN_CONFIGURED_WITH_REQUIRED_ROLES
-              .toLocalizedString());
+          "Region has not been configured with required roles.");
     }
     DistributedRegion dr = (DistributedRegion) region;
     return dr.waitForRequiredRoles(timeout);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java b/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
index 895ad46..1aae543 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
@@ -19,7 +19,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Specifies how the region is affected by resumption of reliability when one or more missing
@@ -75,8 +74,8 @@ public class ResumptionAction implements java.io.Serializable {
   public static ResumptionAction fromName(String name) {
     if (name == null || name.length() == 0) {
       throw new IllegalArgumentException(
-          LocalizedStrings.ResumptionAction_INVALID_RESUMPTIONACTION_NAME_0
-              .toLocalizedString(name));
+          String.format("Invalid ResumptionAction name:  %s",
+              name));
     }
     for (int i = 0; i < PRIVATE_VALUES.length; i++) {
       if (name.equals(PRIVATE_VALUES[i].name)) {
@@ -84,7 +83,7 @@ public class ResumptionAction implements java.io.Serializable {
       }
     }
     throw new IllegalArgumentException(
-        LocalizedStrings.ResumptionAction_INVALID_RESUMPTIONACTION_NAME_0.toLocalizedString(name));
+        String.format("Invalid ResumptionAction name:  %s", name));
   }
 
   /** Returns true if this is <code>NONE</code>. */
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Scope.java b/geode-core/src/main/java/org/apache/geode/cache/Scope.java
index ee154a7..604f6a7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Scope.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Scope.java
@@ -19,7 +19,6 @@ package org.apache.geode.cache;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 
-import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Enumerated type for region distribution scope.
@@ -171,8 +170,8 @@ public class Scope implements Serializable {
       }
     }
     throw new IllegalArgumentException(
-        LocalizedStrings.Scope_0_IS_NOT_A_VALID_STRING_REPRESENTATION_OF_1
-            .toLocalizedString(new Object[] {scope, Scope.class.getName()}));
+        String.format("%s is not a valid string representation of %s.",
+            new Object[] {scope, Scope.class.getName()}));
   }
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
index 517758c..70f0c2c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.cache.xmlcache.AsyncEventQueueCreation;
 import org.apache.geode.internal.cache.xmlcache.CacheCreation;
 import org.apache.geode.internal.cache.xmlcache.ParallelAsyncEventQueueCreation;
 import org.apache.geode.internal.cache.xmlcache.SerialAsyncEventQueueCreation;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 public class AsyncEventQueueFactoryImpl implements AsyncEventQueueFactory {
@@ -152,7 +151,7 @@ public class AsyncEventQueueFactoryImpl implements AsyncEventQueueFactory {
   public AsyncEventQueue create(String asyncQueueId, AsyncEventListener listener) {
     if (listener == null) {
       throw new IllegalArgumentException(
-          LocalizedStrings.AsyncEventQueue_ASYNC_EVENT_LISTENER_CANNOT_BE_NULL.toLocalizedString());
+          "AsyncEventListener cannot be null");
     }
 
     AsyncEventQueue asyncEventQueue;
@@ -188,8 +187,8 @@ public class AsyncEventQueueFactoryImpl implements AsyncEventQueueFactory {
 
     if (gatewaySenderAttributes.getDispatcherThreads() <= 0) {
       throw new AsyncEventQueueConfigurationException(
-          LocalizedStrings.AsyncEventQueue_0_CANNOT_HAVE_DISPATCHER_THREADS_LESS_THAN_1
-              .toLocalizedString(id));
+          String.format("AsyncEventQueue %s can not be created with dispatcher threads less than 1",
+              id));
     }
 
     GatewaySender sender;
@@ -197,8 +196,9 @@ public class AsyncEventQueueFactoryImpl implements AsyncEventQueueFactory {
       if (gatewaySenderAttributes.getOrderPolicy() != null
           && gatewaySenderAttributes.getOrderPolicy().equals(OrderPolicy.THREAD)) {
         throw new AsyncEventQueueConfigurationException(
-            LocalizedStrings.AsyncEventQueue_0_CANNOT_BE_CREATED_WITH_ORDER_POLICY_1
-                .toLocalizedString(id, gatewaySenderAttributes.getOrderPolicy()));
+            String.format(
+                "AsyncEventQueue %s can not be created with OrderPolicy %s when it is set parallel",
+                id, gatewaySenderAttributes.getOrderPolicy()));
       }
 
       if (cache instanceof CacheCreation) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
index 863cfdb..045ced6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
@@ -36,9 +36,7 @@ import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
 import org.apache.geode.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
 import org.apache.geode.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue;
 import org.apache.geode.internal.cache.xmlcache.CacheCreation;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.monitoring.ThreadsMonitoring;
 
 public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
@@ -61,8 +59,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
     this.getLifeCycleLock().writeLock().lock();
     try {
       if (isRunning()) {
-        logger.warn(LocalizedMessage
-            .create(LocalizedStrings.GatewaySender_SENDER_0_IS_ALREADY_RUNNING, this.getId()));
+        logger.warn("Gateway Sender {} is already running", this.getId());
         return;
       }
 
@@ -70,8 +67,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
         String locators = this.cache.getInternalDistributedSystem().getConfig().getLocators();
         if (locators.length() == 0) {
           throw new IllegalStateException(
-              LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
-                  .toLocalizedString());
+              "Locators must be configured before starting gateway-sender.");
         }
       }
       /*
@@ -95,8 +91,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
           (InternalDistributedSystem) this.cache.getDistributedSystem();
       system.handleResourceEvent(ResourceEvent.GATEWAYSENDER_START, this);
 
-      logger.info(
-          LocalizedMessage.create(LocalizedStrings.ParallelGatewaySenderImpl_STARTED__0, this));
+      logger.info("Started  {}", this);
 
       enqueueTempEvents();
     } finally {
@@ -121,7 +116,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
       // stop the running threads, open sockets if any
       ((ConcurrentParallelGatewaySenderQueue) this.eventProcessor.getQueue()).cleanUp();
 
-      logger.info(LocalizedMessage.create(LocalizedStrings.GatewayImpl_STOPPED__0, this));
+      logger.info("Stopped  {}", this);
 
       InternalDistributedSystem system =
           (InternalDistributedSystem) this.cache.getDistributedSystem();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
index 05c2f77..259ae81 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
@@ -38,9 +38,7 @@ import org.apache.geode.internal.cache.wan.serial.ConcurrentSerialGatewaySenderE
 import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderEventProcessor;
 import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueue;
 import org.apache.geode.internal.cache.xmlcache.CacheCreation;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.monitoring.ThreadsMonitoring;
 
 public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
@@ -66,16 +64,14 @@ public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
     this.getLifeCycleLock().writeLock().lock();
     try {
       if (isRunning()) {
-        logger.warn(LocalizedMessage
-            .create(LocalizedStrings.GatewaySender_SENDER_0_IS_ALREADY_RUNNING, this.getId()));
+        logger.warn("Gateway Sender {} is already running", this.getId());
         return;
       }
       if (this.remoteDSId != DEFAULT_DISTRIBUTED_SYSTEM_ID) {
         String locators = this.cache.getInternalDistributedSystem().getConfig().getLocators();
         if (locators.length() == 0) {
           throw new GatewaySenderConfigurationException(
-              LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
-                  .toLocalizedString());
+              "Locators must be configured before starting gateway-sender.");
         }
       }
       getSenderAdvisor().initDLockService();
@@ -109,7 +105,7 @@ public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
       system.handleResourceEvent(ResourceEvent.GATEWAYSENDER_START, this);
 
       logger
-          .info(LocalizedMessage.create(LocalizedStrings.SerialGatewaySenderImpl_STARTED__0, this));
+          .info("Started {}", this);
 
       enqueueTempEvents();
     } finally {
@@ -134,7 +130,7 @@ public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
       for (AsyncEventListener listener : this.listeners) {
         listener.close();
       }
-      logger.info(LocalizedMessage.create(LocalizedStrings.GatewayImpl_STOPPED__0, this));
+      logger.info("Stopped {}", this);
 
       clearTempEventsAfterSenderStopped();
     } finally {
@@ -168,8 +164,7 @@ public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
         Thread.currentThread().interrupt();
       }
       if (lockObtainingThread.isAlive()) {
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.GatewaySender_COULD_NOT_STOP_LOCK_OBTAINING_THREAD_DURING_GATEWAY_SENDER_STOP));
+        logger.info("Could not stop lock obtaining thread during gateway sender stop");
       }
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
index c9388e3..fe6c097 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
@@ -32,7 +32,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.internal.GemFireVersion;
 import org.apache.geode.internal.cache.CacheConfig;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.PdxSerializer;
 import org.apache.geode.security.AuthenticationFailedException;
@@ -647,7 +646,7 @@ public class ClientCacheFactory {
     InternalClientCache instance = GemFireCacheImpl.getInstance();
     if (instance == null) {
       throw new CacheClosedException(
-          LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED.toLocalizedString());
+          "A cache has not yet been created.");
     } else {
       if (!instance.isClient()) {
         throw new IllegalStateException(
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
index c384bb4..76716bc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
@@ -51,9 +51,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
 import org.apache.geode.distributed.internal.membership.gms.membership.HostAddress;
 import org.apache.geode.distributed.internal.tcpserver.TcpClient;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * A connection source which uses locators to find the least loaded server.
@@ -216,9 +214,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
       updateLocatorInLocatorList(locator);
       return null;
     } catch (ClassNotFoundException e) {
-      logger.warn(
-          LocalizedMessage.create(
-              LocalizedStrings.AutoConnectionSourceImpl_RECEIVED_EXCEPTION_FROM_LOCATOR_0, locator),
+      logger.warn(String.format("Received exception from locator %s", locator),
           e);
       return null;
     } catch (ClassCastException e) {
@@ -330,15 +326,13 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
       addedLocators.removeAll(oldLocators.getLocators());
       if (!addedLocators.isEmpty()) {
         locatorCallback.locatorsDiscovered(Collections.unmodifiableList(addedLocators));
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.AutoConnectionSourceImpl_AUTOCONNECTIONSOURCE_DISCOVERED_NEW_LOCATORS_0,
-            addedLocators));
+        logger.info("AutoConnectionSource discovered new locators {}",
+            addedLocators);
       }
       if (!removedLocators.isEmpty()) {
         locatorCallback.locatorsRemoved(Collections.unmodifiableList(removedLocators));
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.AutoConnectionSourceImpl_AUTOCONNECTIONSOURCE_DROPPING_PREVIOUSLY_DISCOVERED_LOCATORS_0,
-            removedLocators));
+        logger.info("AutoConnectionSource dropping previously discovered locators {}",
+            removedLocators);
       }
     }
 
@@ -376,9 +370,8 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
     if (locatorUpdateInterval > 0) {
       pool.getBackgroundProcessor().scheduleWithFixedDelay(new UpdateLocatorListTask(), 0,
           locatorUpdateInterval, TimeUnit.MILLISECONDS);
-      logger.info(LocalizedMessage.create(
-          LocalizedStrings.AutoConnectionSourceImpl_UPDATE_LOCATOR_LIST_TASK_STARTED_WITH_INTERVAL_0,
-          new Object[] {this.locatorUpdateInterval}));
+      logger.info("AutoConnectionSource UpdateLocatorListTask started with interval={} ms.",
+          new Object[] {this.locatorUpdateInterval});
     }
   }
 
@@ -393,9 +386,8 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
   private synchronized void reportLiveLocator(InetSocketAddress l) {
     Object prevState = this.locatorState.put(l, null);
     if (prevState != null) {
-      logger.info(LocalizedMessage.create(
-          LocalizedStrings.AutoConnectionSourceImpl_COMMUNICATION_HAS_BEEN_RESTORED_WITH_LOCATOR_0,
-          l));
+      logger.info("Communication has been restored with locator {}.",
+          l);
     }
   }
 
@@ -403,12 +395,11 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
     Object prevState = this.locatorState.put(l, ex);
     if (prevState == null) {
       if (ex instanceof ConnectException) {
-        logger.info(LocalizedMessage
-            .create(LocalizedStrings.AutoConnectionSourceImpl_LOCATOR_0_IS_NOT_RUNNING, l), ex);
+        logger.info(String.format("locator %s is not running.", l), ex);
       } else {
-        logger.info(LocalizedMessage.create(
-            LocalizedStrings.AutoConnectionSourceImpl_COMMUNICATION_WITH_LOCATOR_0_FAILED_WITH_1,
-            new Object[] {l, ex}), ex);
+        logger.info(String.format("Communication with locator %s failed with %s.",
+            new Object[] {l, ex}),
+            ex);
       }
     }
   }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index db24aa0..93ecd99 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -44,7 +44,6 @@ import org.apache.geode.internal.cache.InternalRegion;
 import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.PartitionedRegionHelper;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -143,8 +142,7 @@ public class ClientMetadataService {
       resolveKey = resolver.getRoutingObject(entryOp);
       if (resolveKey == null) {
         throw new IllegalStateException(
-            LocalizedStrings.PartitionedRegionHelper_THE_ROUTINGOBJECT_RETURNED_BY_PARTITIONRESOLVER_IS_NULL
-                .toLocalizedString());
+            "The RoutingObject returned by PartitionResolver is null.");
       }
     }
     int bucketId;
@@ -157,8 +155,8 @@ public class ClientMetadataService {
       if (partition == null) {
         Object[] prms = new Object[] {region.getName(), resolver};
         throw new IllegalStateException(
-            LocalizedStrings.PartitionedRegionHelper_FOR_REGION_0_PARTITIONRESOLVER_1_RETURNED_PARTITION_NAME_NULL
-                .toLocalizedString(prms));
+            String.format("For region %s, partition resolver %s returned partition name null",
+                prms));
       } else {
         bucketId = prAdvisor.assignFixedBucketId(region, partition, resolveKey);
         if (bucketId == -1) {
@@ -467,8 +465,7 @@ public class ClientMetadataService {
       resolveKey = resolver.getRoutingObject(entryOp);
       if (resolveKey == null) {
         throw new IllegalStateException(
-            LocalizedStrings.PartitionedRegionHelper_THE_ROUTINGOBJECT_RETURNED_BY_PARTITIONRESOLVER_IS_NULL
-                .toLocalizedString());
+            "The RoutingObject returned by PartitionResolver is null.");
       }
     }
 
@@ -481,8 +478,8 @@ public class ClientMetadataService {
       if (partition == null) {
         Object[] prms = new Object[] {region.getName(), resolver};
         throw new IllegalStateException(
-            LocalizedStrings.PartitionedRegionHelper_FOR_REGION_0_PARTITIONRESOLVER_1_RETURNED_PARTITION_NAME_NULL
-                .toLocalizedString(prms));
+            String.format("For region %s, partition resolver %s returned partition name null",
+                prms));
       } else {
         bucketId = prAdvisor.assignFixedBucketId(region, partition, resolveKey);
         // This bucketid can be -1 in some circumstances where we don't have information about
@@ -697,8 +694,7 @@ public class ClientMetadataService {
       resolveKey = resolver.getRoutingObject(entryOp);
       if (resolveKey == null) {
         throw new IllegalStateException(
-            LocalizedStrings.PartitionedRegionHelper_THE_ROUTINGOBJECT_RETURNED_BY_PARTITIONRESOLVER_IS_NULL
-                .toLocalizedString());
+            "The RoutingObject returned by PartitionResolver is null.");
       }
     }
 
@@ -712,8 +708,8 @@ public class ClientMetadataService {
       if (partition == null) {
         Object[] prms = new Object[] {region.getName(), resolver};
         throw new IllegalStateException(
-            LocalizedStrings.PartitionedRegionHelper_FOR_REGION_0_PARTITIONRESOLVER_1_RETURNED_PARTITION_NAME_NULL
-                .toLocalizedString(prms));
+            String.format("For region %s, partition resolver %s returned partition name null",
+                prms));
       } else {
         bucketId = prAdvisor.assignFixedBucketId(region, partition, resolveKey);
       }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientPartitionAdvisor.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientPartitionAdvisor.java
index 44d973d..c935197 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientPartitionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientPartitionAdvisor.java
@@ -34,7 +34,6 @@ import org.apache.geode.distributed.internal.ServerLocation;
 import org.apache.geode.internal.ClassPathLoader;
 import org.apache.geode.internal.cache.BucketServerLocation66;
 import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -82,8 +81,8 @@ public class ClientPartitionAdvisor {
       }
 
       throw new InternalGemFireException(
-          LocalizedStrings.ClientPartitionAdvisor_CANNOT_CREATE_AN_INSTANCE_OF_PARTITION_RESOLVER_0
-              .toLocalizedString(partitionResolverName));
+          String.format("Cannot create an instance of PartitionResolver : %s",
+              partitionResolverName));
     }
     if (fpaSet != null) {
       fixedPAMap = new ConcurrentHashMap<String, List<Integer>>();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
index 57a1b26..54703ea 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
@@ -60,7 +60,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.EncryptorImpl;
 import org.apache.geode.internal.cache.tier.sockets.Handshake;
 import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.security.SecurityService;
 import org.apache.geode.security.AuthenticationFailedException;
 import org.apache.geode.security.AuthenticationRequiredException;
@@ -197,7 +196,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
         // This is likely the case of server setup with SSL and client not using
         // SSL
         throw new AuthenticationRequiredException(
-            LocalizedStrings.HandShake_SERVER_EXPECTING_SSL_CONNECTION.toLocalizedString());
+            "Server expecting SSL connection");
       }
       if (acceptanceCode == REPLY_SERVER_IS_LOCATOR) {
         throw new GemFireConfigException("Improperly configured client detected.  " + "Server at "
@@ -277,7 +276,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
       throw e;
     } catch (Exception e) {
       throw new InternalGemFireException(
-          LocalizedStrings.HandShake_UNABLE_TO_DESERIALIZE_MEMBER.toLocalizedString(), e);
+          "Unable to deserialize member", e);
     }
   }
 
@@ -310,7 +309,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
         // This is likely the case of server setup with SSL and client not using
         // SSL
         throw new AuthenticationRequiredException(
-            LocalizedStrings.HandShake_SERVER_EXPECTING_SSL_CONNECTION.toLocalizedString());
+            "Server expecting SSL connection");
       }
 
       byte endpointType = dis.readByte();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
index 73ebb03..a9bf616 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
@@ -31,9 +31,7 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.ServerLocation;
 import org.apache.geode.internal.cache.tier.sockets.CacheClientUpdater;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.net.SocketCreatorFactory;
 import org.apache.geode.internal.security.SecurableCommunicationChannel;
 import org.apache.geode.security.GemFireSecurityException;
@@ -115,9 +113,8 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
       throw e;
     } catch (ServerRefusedConnectionException src) {
       // propagate this up, don't retry
-      logger.warn(LocalizedMessage.create(
-          LocalizedStrings.AutoConnectionSourceImpl_COULD_NOT_CREATE_A_NEW_CONNECTION_TO_SERVER_0,
-          src.getMessage()));
+      logger.warn("Could not create a new connection to server: {}",
+          src.getMessage());
       testFailedConnectionToServer = true;
       throw src;
     } catch (Exception e) {
@@ -128,8 +125,7 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
           logger.debug("Unable to connect to {}: connection refused", location);
         }
       } else {// print a warning with the exception stack trace
-        logger.warn(LocalizedMessage
-            .create(LocalizedStrings.ConnectException_COULD_NOT_CONNECT_TO_0, location), e);
+        logger.warn("Could not connect to: %s", location, e);
       }
       testFailedConnectionToServer = true;
     } finally {
@@ -234,8 +230,7 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
               srce);
         }
       } catch (Exception e) {
-        logger.warn(LocalizedMessage
-            .create(LocalizedStrings.ConnectException_COULD_NOT_CONNECT_TO_0, server), e);
+        logger.warn(String.format("Could not connect to: %s", server), e);
       }
 
       excludedServers.add(server);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
index 26de256..e4cc9af 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
@@ -40,9 +40,7 @@ import org.apache.geode.internal.cache.tier.ClientSideHandshake;
 import org.apache.geode.internal.cache.tier.CommunicationMode;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.net.SocketCreator;
 
 /**
@@ -337,10 +335,10 @@ public class ConnectionImpl implements Connection {
 
   private void verifySocketBufferSize(int requestedBufferSize, int actualBufferSize, String type) {
     if (actualBufferSize < requestedBufferSize) {
-      logger.info(LocalizedMessage.create(
-          LocalizedStrings.Connection_SOCKET_0_IS_1_INSTEAD_OF_THE_REQUESTED_2,
-          new Object[] {new StringBuilder(type).append(" buffer size").toString(), actualBufferSize,
-              requestedBufferSize}));
+      logger.info("Socket {} buffer size is {} instead of the requested {}.",
+          new Object[] {type,
+              actualBufferSize,
+              requestedBufferSize});
     }
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DataSerializerRecoveryListener.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DataSerializerRecoveryListener.java
index 866d01f..71f3b35 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DataSerializerRecoveryListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DataSerializerRecoveryListener.java
@@ -26,9 +26,7 @@ import org.apache.geode.cache.client.internal.PoolImpl.PoolTask;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.InternalDataSerializer.SerializerAttributesHolder;
 import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 public class DataSerializerRecoveryListener extends EndpointManager.EndpointListenerAdapter {
   private static final Logger logger = LogService.getLogger();
@@ -132,16 +130,13 @@ public class DataSerializerRecoveryListener extends EndpointManager.EndpointList
           Throwable cause = e.getCause();
           boolean cnfException = false;
           if (cause instanceof ClassNotFoundException) {
-            logger.warn(LocalizedMessage.create(
-                LocalizedStrings.DataSerializerRecoveryListener_ERROR_CLASSNOTFOUNDEXCEPTION,
-                cause.getMessage()));
+            logger.warn("DataSerializerRecoveryTask - Error ClassNotFoundException: {}",
+                cause.getMessage());
             cnfException = true;
           }
 
           if (!recoveryScheduled && !cnfException) {
-            logger.warn(
-                LocalizedMessage.create(
-                    LocalizedStrings.DataSerializerRecoveryListener_ERROR_RECOVERING_DATASERIALIZERS),
+            logger.warn("DataSerializerRecoveryTask - Error recovering dataSerializers: ",
                 e);
             try {
               background.schedule(new RecoveryTask(), pingInterval, TimeUnit.MILLISECONDS);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
index 9c01a85..1eac281 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.Part;
 import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -230,8 +229,7 @@ public class DestroyOp {
           logger.debug("received REMOVE response from server with entryNotFound={}", entryNotFound);
         }
         return new EntryNotFoundException(
-            LocalizedStrings.AbstractRegionMap_ENTRY_NOT_FOUND_WITH_EXPECTED_VALUE
-                .toLocalizedString());
+            "entry not found with expected value");
       }
       return null;
     }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
index 72a6d93..42fce07 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
@@ -30,9 +30,7 @@ import org.apache.geode.internal.cache.execute.MemberMappedArgument;
 import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.Part;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Does a Execution of function on server (possibly without region/cache) It does not get the resulf
@@ -188,11 +186,9 @@ public class ExecuteFunctionNoAckOp {
         Part part = msg.getPart(0);
         if (msgType == MessageType.EXCEPTION) {
           Throwable t = (Throwable) part.getObject();
-          logger.warn(LocalizedMessage
-              .create(LocalizedStrings.EXECUTE_FUNCTION_NO_HAS_RESULT_RECEIVED_EXCEPTION), t);
+          logger.warn("Function execution without result encountered an Exception on server.", t);
         } else if (isErrorResponse(msgType)) {
-          logger.warn(LocalizedMessage
-              .create(LocalizedStrings.EXECUTE_FUNCTION_NO_HAS_RESULT_RECEIVED_EXCEPTION));
+          logger.warn("Function execution without result encountered an Exception on server.");
         } else {
           throw new InternalGemFireError(
               "Unexpected message type " + MessageType.getString(msgType));
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
index 2cd5b76..6bed369 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
 import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.Part;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -616,8 +615,8 @@ public class ExecuteFunctionOp {
             String errorMessage = executeFunctionResponseMsg.getPart(0).getString();
             throw new ServerOperationException(errorMessage);
           default:
-            throw new InternalGemFireError(LocalizedStrings.Op_UNKNOWN_MESSAGE_TYPE_0
-                .toLocalizedString(Integer.valueOf(executeFunctionResponseMsg.getMessageType())));
+            throw new InternalGemFireError(String.format("Unknown message type %s",
+                Integer.valueOf(executeFunctionResponseMsg.getMessageType())));
         }
       } finally {
         executeFunctionResponseMsg.clear();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
index 7d080b0..8550a48 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
@@ -28,9 +28,7 @@ import org.apache.geode.internal.cache.execute.ServerRegionFunctionExecutor;
 import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.Part;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Does a Execution of function on server region It does not get the resul from the server (follows
@@ -178,11 +176,9 @@ public class ExecuteRegionFunctionNoAckOp {
         Part part = msg.getPart(0);
         if (msgType == MessageType.EXCEPTION) {
           Throwable t = (Throwable) part.getObject();
-          logger.warn(LocalizedMessage
-              .create(LocalizedStrings.EXECUTE_FUNCTION_NO_HAS_RESULT_RECEIVED_EXCEPTION), t);
+          logger.warn("Function execution without result encountered an Exception on server.", t);
         } else if (isErrorResponse(msgType)) {
-          logger.warn(LocalizedMessage
-              .create(LocalizedStrings.EXECUTE_FUNCTION_NO_HAS_RESULT_RECEIVED_EXCEPTION));
+          logger.warn("Function execution without result encountered an Exception on server.");
         } else {
           throw new InternalGemFireError(
               "Unexpected message type " + MessageType.getString(msgType));
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
index 94ad7d1..c82860d 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
@@ -25,7 +25,6 @@ import org.apache.geode.internal.cache.BucketServerLocation66;
 import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.Part;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -133,8 +132,8 @@ public class GetClientPRMetaDataOp {
           String s = "While performing  GetClientPRMetaDataOp " + ((Throwable) obj).getMessage();
           throw new ServerOperationException(s, (Throwable) obj);
         default:
-          throw new InternalGemFireError(LocalizedStrings.Op_UNKNOWN_MESSAGE_TYPE_0
-              .toLocalizedString(Integer.valueOf(msg.getMessageType())));
+          throw new InternalGemFireError(String.format("Unknown message type %s",
+              Integer.valueOf(msg.getMessageType())));
       }
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
index ccda3d0..19d8e46 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
@@ -24,7 +24,6 @@ import org.apache.geode.cache.client.ServerOperationException;
 import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.Part;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
 /**
@@ -138,8 +137,8 @@ public class GetClientPartitionAttributesOp {
               "While performing  GetClientPartitionAttributesOp " + ((Throwable) obj).getMessage();
           throw new ServerOperationException(s, (Throwable) obj);
         default:
-          throw new InternalGemFireError(LocalizedStrings.Op_UNKNOWN_MESSAGE_TYPE_0
-              .toLocalizedString(Integer.valueOf(msg.getMessageType())));
+          throw new InternalGemFireError(String.format("Unknown message type %s",
+              Integer.valueOf(msg.getMessageType())));
       }
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InstantiatorRecoveryListener.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InstantiatorRecoveryListener.java
index 551e18a..25e369e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InstantiatorRecoveryListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InstantiatorRecoveryListener.java
@@ -25,9 +25,7 @@ import org.apache.geode.CancelException;
 import org.apache.geode.cache.client.internal.PoolImpl.PoolTask;
 import org.apache.geode.internal.InternalInstantiator;
 import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * A listener which will try to resend the instantiators to all servers if the entire server
@@ -133,13 +131,10 @@ public class InstantiatorRecoveryListener extends EndpointManager.EndpointListen
           // If an exception occurred on the server, don't retry
           Throwable cause = e.getCause();
           if (cause instanceof ClassNotFoundException) {
-            logger.warn(LocalizedMessage.create(
-                LocalizedStrings.InstantiatorRecoveryListener_INSTANTIATORRECOVERYTASK_ERROR_CLASSNOTFOUNDEXCEPTION,
-                cause.getMessage()));
+            logger.warn("InstantiatorRecoveryTask - Error ClassNotFoundException: {}",
+                cause.getMessage());
           } else {
-            logger.warn(
-                LocalizedMessage.create(
-                    LocalizedStrings.InstantiatorRecoveryListener_INSTANTIATORRECOVERYTASK_ERROR_RECOVERING_INSTANTIATORS),
+            logger.warn("InstantiatorRecoveryTask - Error recovering instantiators:",
                 e);
           }
         } finally {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
index d91fd9a..15d2243 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
@@ -60,11 +60,9 @@ import org.apache.geode.internal.cache.PoolFactoryImpl;
 import org.apache.geode.internal.cache.PoolManagerImpl;
 import org.apache.geode.internal.cache.PoolStats;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.InternalLogWriter;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LoggingExecutors;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.monitoring.ThreadsMonitoring;
 import org.apache.geode.internal.statistics.DummyStatisticsFactory;
 
@@ -222,15 +220,13 @@ public class PoolImpl implements InternalPool {
     this.dsys = distributedSystem;
     if (this.dsys == null) {
       throw new IllegalStateException(
-          LocalizedStrings.PoolImpl_DISTRIBUTED_SYSTEM_MUST_BE_CREATED_BEFORE_CREATING_POOL
-              .toLocalizedString());
+          "Distributed System must be created before creating pool");
     }
     this.cache = cache;
     this.securityLogWriter = this.dsys.getSecurityInternalLogWriter();
     if (!this.dsys.getConfig().getStatisticSamplingEnabled() && this.statisticInterval > 0) {
-      logger.info(LocalizedMessage.create(
-          LocalizedStrings.PoolImpl_STATISTIC_SAMPLING_MUST_BE_ENABLED_FOR_SAMPLING_RATE_OF_0_TO_TAKE_AFFECT,
-          this.statisticInterval));
+      logger.info("statistic-sampling must be enabled for sampling rate of {} to take affect",
+          this.statisticInterval);
     }
     this.cancelCriterion = new Stopper();
     if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "SPECIAL_DURABLE")) {
@@ -347,9 +343,8 @@ public class PoolImpl implements InternalPool {
           statisticInterval, TimeUnit.MILLISECONDS);
     }
     // LOG: changed from config to info
-    logger.info(LocalizedMessage.create(
-        LocalizedStrings.PoolImpl_POOL_0_STARTED_WITH_MULTIUSER_SECURE_MODE_ENABLED_1,
-        new Object[] {this.name, this.multiuserSecureModeEnabled}));
+    logger.info("Pool {} started with multiuser-authentication={}",
+        new Object[] {this.name, this.multiuserSecureModeEnabled});
   }
 
   /**
@@ -506,8 +501,7 @@ public class PoolImpl implements InternalPool {
               cache = dsys.getCache();
               if (cache == null) {
                 throw new IllegalStateException(
-                    LocalizedStrings.PoolImpl_CACHE_MUST_BE_CREATED_BEFORE_CREATING_POOL
-                        .toLocalizedString());
+                    "Cache must be created before creating pool");
               }
             }
             if (!cache.isClosed() && this.getPoolOrCacheCancelInProgress() == null) {
@@ -552,8 +546,8 @@ public class PoolImpl implements InternalPool {
       cnt = getAttachCount();
       if (cnt > 0) {
         throw new IllegalStateException(
-            LocalizedStrings.PoolImpl_POOL_COULD_NOT_BE_DESTROYED_BECAUSE_IT_IS_STILL_IN_USE_BY_0_REGIONS
-                .toLocalizedString(cnt));
+            String.format("Pool could not be destroyed because it is still in use by %s regions",
+                cnt));
       }
     }
     if (this.pm.unregister(this)) {
@@ -570,23 +564,19 @@ public class PoolImpl implements InternalPool {
       this.destroyed = true;
       this.keepAlive = keepAlive;
       // LOG: changed from config to info
-      logger.info(
-          LocalizedMessage.create(LocalizedStrings.PoolImpl_DESTROYING_CONNECTION_POOL_0, name));
+      logger.info("Destroying connection pool {}", name);
 
       try {
         if (backgroundProcessor != null) {
           backgroundProcessor.shutdown();
           if (!backgroundProcessor.awaitTermination(SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS)) {
-            logger.warn(LocalizedMessage.create(
-                LocalizedStrings.PoolImpl_TIMEOUT_WAITING_FOR_BACKGROUND_TASKS_TO_COMPLETE));
+            logger.warn("Timeout waiting for background tasks to complete.");
           }
         }
       } catch (RuntimeException e) {
-        logger.error(LocalizedMessage.create(
-            LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_BACKGROUNDPROCESSOR), e);
+        logger.error("Error encountered while stopping backgroundProcessor.", e);
       } catch (InterruptedException e) {
-        logger.error(LocalizedMessage
-            .create(LocalizedStrings.PoolImpl_INTERRUPTED_WHILE_STOPPING_BACKGROUNDPROCESSOR), e);
+        logger.error("Interrupted while stopping backgroundProcessor", e);
       }
 
       try {
@@ -594,8 +584,7 @@ public class PoolImpl implements InternalPool {
           this.source.stop();
         }
       } catch (RuntimeException e) {
-        logger.error(LocalizedMessage.create(
-            LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_CONNECTION_SOURCE), e);
+        logger.error("Error encountered while stopping connection source.", e);
       }
 
       try {
@@ -604,8 +593,7 @@ public class PoolImpl implements InternalPool {
         }
       } catch (RuntimeException e) {
         logger.error(
-            LocalizedMessage.create(
-                LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_SUBSCRIPTION_MANAGER),
+            "Error encountered while stopping subscription manager",
             e);
       }
 
@@ -614,15 +602,13 @@ public class PoolImpl implements InternalPool {
           manager.close(keepAlive);
         }
       } catch (RuntimeException e) {
-        logger.error(LocalizedMessage.create(
-            LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_CONNECTION_MANAGER), e);
+        logger.error("Error encountered while stopping connection manager.", e);
       }
 
       try {
         endpointManager.close();
       } catch (RuntimeException e) {
-        logger.error(LocalizedMessage.create(
-            LocalizedStrings.PoolImpl_ERROR_ENCOUNTERED_WHILE_STOPPING_ENDPOINT_MANAGER), e);
+        logger.error("Error encountered while stopping endpoint manager", e);
       }
 
       try {
@@ -630,8 +616,7 @@ public class PoolImpl implements InternalPool {
           this.stats.close();
         }
       } catch (RuntimeException e) {
-        logger.error(
-            LocalizedMessage.create(LocalizedStrings.PoolImpl_ERROR_WHILE_CLOSING_STATISTICS), e);
+        logger.error("Error while closing statistics", e);
       }
     }
   }
@@ -661,89 +646,89 @@ public class PoolImpl implements InternalPool {
   public void sameAs(Object obj) {
     if (!(obj instanceof PoolImpl)) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl__0_IS_NOT_THE_SAME_AS_1_BECAUSE_IT_SHOULD_HAVE_BEEN_A_POOLIMPL
-              .toLocalizedString(new Object[] {this, obj}));
+          String.format("%s is not the same as %s because it should have been a PoolImpl",
+              new Object[] {this, obj}));
     }
     PoolImpl other = (PoolImpl) obj;
     if (!getName().equals(other.getName())) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_ARE_DIFFERENT.toLocalizedString("names"));
+          String.format("Pool %s are different", "names"));
     }
     if (getSocketConnectTimeout() != other.getSocketConnectTimeout()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("socketConnectimeout"));
+          String.format("Pool %s is different", "socketConnectimeout"));
     }
     if (getFreeConnectionTimeout() != other.getFreeConnectionTimeout()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("connectionTimeout"));
+          String.format("Pool %s is different", "connectionTimeout"));
     }
     if (getLoadConditioningInterval() != other.getLoadConditioningInterval()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("connectionLifetime"));
+          String.format("Pool %s is different", "connectionLifetime"));
     }
     if (getSocketBufferSize() != other.getSocketBufferSize()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("socketBufferSize"));
+          String.format("Pool %s is different", "socketBufferSize"));
     }
     if (getThreadLocalConnections() != other.getThreadLocalConnections()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("threadLocalConnections"));
+          String.format("Pool %s is different", "threadLocalConnections"));
     }
     if (getReadTimeout() != other.getReadTimeout()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("readTimeout"));
+          String.format("Pool %s is different", "readTimeout"));
     }
     if (getMinConnections() != other.getMinConnections()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("MinConnections"));
+          String.format("Pool %s is different", "MinConnections"));
     }
     if (getMaxConnections() != other.getMaxConnections()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("MaxConnections"));
+          String.format("Pool %s is different", "MaxConnections"));
     }
     if (getRetryAttempts() != other.getRetryAttempts()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("RetryAttempts"));
+          String.format("Pool %s is different", "RetryAttempts"));
     }
     if (getIdleTimeout() != other.getIdleTimeout()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("IdleTimeout"));
+          String.format("Pool %s is different", "IdleTimeout"));
     }
     if (getPingInterval() != other.getPingInterval()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("PingInterval"));
+          String.format("Pool %s is different", "PingInterval"));
     }
     if (getStatisticInterval() != other.getStatisticInterval()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("StatisticInterval"));
+          String.format("Pool %s is different", "StatisticInterval"));
     }
     if (getSubscriptionAckInterval() != other.getSubscriptionAckInterval()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("subscriptionAckInterval"));
+          String.format("Pool %s is different", "subscriptionAckInterval"));
     }
     if (getSubscriptionEnabled() != other.getSubscriptionEnabled()) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("subscriptionEnabled"));
+          String.format("Pool %s is different", "subscriptionEnabled"));
     }
     if (getSubscriptionMessageTrackingTimeout() != other.getSubscriptionMessageTrackingTimeout()) {
-      throw new RuntimeException(LocalizedStrings.PoolImpl_0_IS_DIFFERENT
-          .toLocalizedString("subscriptionMessageTrackingTimeout"));
+      throw new RuntimeException(String.format("Pool %s is different",
+          "subscriptionMessageTrackingTimeout"));
     }
     if (getSubscriptionRedundancy() != other.getSubscriptionRedundancy()) {
-      throw new RuntimeException(LocalizedStrings.PoolImpl_0_IS_DIFFERENT
-          .toLocalizedString("subscriptionRedundancyLevel"));
+      throw new RuntimeException(String.format("Pool %s is different",
+          "subscriptionRedundancyLevel"));
     }
     if (!getServerGroup().equals(other.getServerGroup())) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_IS_DIFFERENT.toLocalizedString("serverGroup"));
+          String.format("Pool %s is different", "serverGroup"));
     }
     if (!getLocators().equals(other.getLocators())) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_ARE_DIFFERENT.toLocalizedString("locators"));
+          String.format("Pool %s are different", "locators"));
     }
     if (!getServers().equals(other.getServers())) {
       throw new RuntimeException(
-          LocalizedStrings.PoolImpl_0_ARE_DIFFERENT.toLocalizedString("servers"));
+          String.format("Pool %s are different", "servers"));
     }
     // ignore startDisabled
   }
@@ -1330,8 +1315,7 @@ public class PoolImpl implements InternalPool {
           logger.debug("Pool task <{}> cancelled", this);
         }
       } catch (Throwable t) {
-        logger.error(LocalizedMessage
-            .create(LocalizedStrings.PoolImpl_UNEXPECTED_ERROR_IN_POOL_TASK_0, this), t);
+        logger.error(String.format("Unexpected error in pool task <%s>", this), t);
       }
 
     }
@@ -1425,8 +1409,7 @@ public class PoolImpl implements InternalPool {
       cache = dsys.getCache();
       if (cache == null) {
         throw new IllegalStateException(
-            LocalizedStrings.PoolImpl_CACHE_MUST_BE_CREATED_BEFORE_CREATING_POOL
-                .toLocalizedString());
+            "Cache must be created before creating pool");
       }
     }
     ProxyCache proxy = new ProxyCache(props, cache, this);
@@ -1452,8 +1435,7 @@ public class PoolImpl implements InternalPool {
         cache = dsys.getCache();
         if (cache == null) {
           throw new IllegalStateException(
-              LocalizedStrings.PoolImpl_CACHE_MUST_BE_CREATED_BEFORE_CREATING_POOL
-                  .toLocalizedString());
+              "Cache must be created before creating pool");
         }
       }
       if (cacheCriterion == null || cacheCriterion != cache.getCancelCriterion()) {
@@ -1481,8 +1463,7 @@ public class PoolImpl implements InternalPool {
           cache = dsys.getCache();
           if (cache == null) {
             throw new IllegalStateException(
-                LocalizedStrings.PoolImpl_CACHE_MUST_BE_CREATED_BEFORE_CREATING_POOL
-                    .toLocalizedString());
+                "Cache must be created before creating pool");
           }
         }
         if (cacheCriterion == null) {
@@ -1535,7 +1516,7 @@ public class PoolImpl implements InternalPool {
       UserAttributes userAttributes = UserAttributes.userAttributes.get();
       if (userAttributes == null) {
         throw new UnsupportedOperationException(
-            LocalizedStrings.MultiUserSecurityEnabled_USE_POOL_API.toLocalizedString());
+            "Use Pool APIs for doing operations when multiuser-secure-mode-enabled is set to true.");
       }
       if (serverLocation != null) {
         if (!userAttributes.getServerToId().containsKey(serverLocation)) {
@@ -1580,7 +1561,7 @@ public class PoolImpl implements InternalPool {
         }
       } else {
         throw new UnsupportedOperationException(
-            LocalizedStrings.MultiUserSecurityEnabled_USE_POOL_API.toLocalizedString());
+            "Use Pool APIs for doing operations when multiuser-secure-mode-enabled is set to true.");
       }
     }
   }
@@ -1592,13 +1573,11 @@ public class PoolImpl implements InternalPool {
   public int getPendingEventCount() {
     if (!isDurableClient() || this.queueManager == null) {
       throw new IllegalStateException(
-          LocalizedStrings.PoolManagerImpl_ONLY_DURABLE_CLIENTS_SHOULD_CALL_GETPENDINGEVENTCOUNT
-              .toLocalizedString());
+          "Only durable clients should call getPendingEventCount()");
     }
     if (this.readyForEventsCalled) {
       throw new IllegalStateException(
-          LocalizedStrings.PoolManagerImpl_GETPENDINGEVENTCOUNT_SHOULD_BE_CALLED_BEFORE_INVOKING_READYFOREVENTS
-              .toLocalizedString());
+          "getPendingEventCount() should be called before invoking readyForEvents().");
     }
     return this.primaryQueueSize.get();
   }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
index 03fe423..f79e122 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
@@ -52,7 +52,6 @@ import org.apache.geode.cache.query.internal.cq.ClientCQ;
 import org.apache.geode.cache.query.internal.cq.CqService;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.i18n.StringId;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.cache.ClientServerObserver;
 import org.apache.geode.internal.cache.ClientServerObserverHolder;
@@ -62,11 +61,9 @@ import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.tier.InterestType;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
-import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.InternalLogWriter;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.LoggingExecutors;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.security.GemFireSecurityException;
 
 /**
@@ -213,8 +210,7 @@ public class QueueManagerImpl implements QueueManager {
     if (recoveryThread != null) {
       try {
         if (!recoveryThread.awaitTermination(PoolImpl.SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS)) {
-          logger.warn(LocalizedMessage.create(
-              LocalizedStrings.QueueManagerImpl_TIMEOUT_WAITING_FOR_RECOVERY_THREAD_TO_COMPLETE));
+          logger.warn("Timeout waiting for recovery thread to complete");
         }
       } catch (InterruptedException ignore) {
         Thread.currentThread().interrupt();
@@ -233,9 +229,9 @@ public class QueueManagerImpl implements QueueManager {
         }
         primary.internalClose(keepAlive);
       } catch (Exception e) {
... 61214 lines suppressed ...


Mime
View raw message