diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index 92b848fcd..f8e66311a 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -52,16 +52,6 @@
 #include <cstring>
 #include <glob.h>
 
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-#include <stdio.h>
-#include <string.h> /* for strncpy */
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <net/if.h>
-
 #include <readline/readline.h>
 #include <readline/history.h>
 #include "boost/filesystem/operations.hpp"
@@ -433,61 +423,6 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-    //check for local ip address as pm1
-    ModuleConfig moduleconfig;
-
-    try
-    {
-        oam.getSystemConfig("pm1", moduleconfig);
-        if (moduleconfig.hostConfigList.size() > 0 )
-        {
-            HostConfigList::iterator pt1 = moduleconfig.hostConfigList.begin();
-            string PM1ipAdd = (*pt1).IPAddr;
-            cout << PM1ipAdd << endl;
-
-            if ( PM1ipAdd != "127.0.0.1" && PM1ipAdd != "0.0.0.0")
-            {
-                struct ifaddrs *ifap, *ifa;
-                struct sockaddr_in *sa;
-                char *addr;
-                bool found = false;
-
-                getifaddrs (&ifap);
-                for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-                    if (ifa->ifa_addr->sa_family==AF_INET) {
-                        sa = (struct sockaddr_in *) ifa->ifa_addr;
-                        addr = inet_ntoa(sa->sin_addr);
-                        printf("Interface: %s\tAddress: %s\n", ifa->ifa_name, addr);
-
-                        if ( PM1ipAdd == addr )
-                        {
-							//match
-                            found = true;
-                        }
-                    }
-
-                    if (found)
-                        break;
-                }
-
-                freeifaddrs(ifap);
-
-                if (!found)
-                {
-                    cout << endl;
-                    cout << "ERROR: postConfigure install can only be done on the PM1" << endl;
-                    cout << "designated node. The configured PM1 IP address doesn't match the local" << endl;
-                    cout << "IP Address. exiting..." << endl;
-                    exit(1);
-                }
-            }
-        }
-    }
-    catch(...)
-    {}
-
-
-
 	// run my.cnf upgrade script
 	if ( reuseConfig == "y" )
 	{
@@ -731,6 +666,75 @@ int main(int argc, char *argv[])
 			exit(1);
 		}
 
+		cout <<         "NOTE: The MariaDB ColumnStore Schema Sync feature will replicate all of the" << endl;
+     	cout <<         "      schemas and InnoDB tables across the User Module nodes. This feature can be enabled" << endl;
+     	cout <<         "      or disabled, for example, if you wish to configure your own replication post installation." << endl << endl;
+
+       	try {
+        	MySQLRep = sysConfig->getConfig(InstallSection, "MySQLRep");
+       	}
+       	catch(...)
+        {}
+
+        if ( MySQLRep == "y" )
+        	mysqlRep = true;
+
+       	string answer = "y";
+
+        while(true) {
+        	if ( mysqlRep )
+                        prompt = "MariaDB ColumnStore Schema Sync feature is Enabled, do you want to leave enabled? [y,n] (y) > ";
+                    else
+                        prompt = "MariaDB ColumnStore Schema Sync feature, do you want to enable? [y,n] (y) > ";
+
+                    pcommand = callReadline(prompt.c_str());
+                    if (pcommand) {
+                        if (strlen(pcommand) > 0) answer = pcommand;
+                        callFree(pcommand);
+                    }
+
+                    if ( answer == "y" || answer == "n" ) {
+                        cout << endl;
+                        break;
+                    }
+                    else
+                        cout << "Invalid Entry, please enter 'y' for yes or 'n' for no" << endl;
+                    if ( noPrompting )
+                        exit(1);
+   		}
+
+                if ( mysqlRep )
+                { // current enabled
+                    if ( answer == "y" ) {
+                        mysqlRep = true;
+                        MySQLRep = "y";
+                    }
+					else
+					{
+                        mysqlRep = false;
+                        MySQLRep = "n";
+					}
+                }
+                else
+                { // currently disabled
+                    if ( answer == "y" ) {
+                        mysqlRep = false;
+                        MySQLRep = "n";
+                    }
+                    else
+                    {
+                        mysqlRep = true;
+                        MySQLRep = "y";
+                    }
+                }
+
+                try {
+                     sysConfig->setConfig(InstallSection, "MySQLRep", MySQLRep);
+                }
+                catch(...)
+                {}
+
+
 		switch ( IserverTypeInstall ) {
 			case (oam::INSTALL_COMBINE_DM_UM_PM):	// combined #1 - dm/um/pm on a single server
 			{
@@ -820,75 +824,6 @@ int main(int argc, char *argv[])
 		break;
 	}
 
-	// check for Schema Schema is Local Query wasnt selected
-	if (!pmwithum)
-	{
-	    cout <<         "NOTE: The MariaDB ColumnStore Schema Sync feature will replicate all of the" << endl;
-	    cout <<         "      schemas and InnoDB tables across the User Module nodes. This feature can be enabled" << endl;
-	    cout <<         "      or disabled, for example, if you wish to configure your own replication post installation." << endl << endl;
-
-	    try {
-		    MySQLRep = sysConfig->getConfig(InstallSection, "MySQLRep");
-	    }
-	    catch(...)
-	    {}
-
-	    if ( MySQLRep == "y" )
-		  mysqlRep = true;
-
-	    string answer = "y";
-
-	    while(true) {
-		  if ( mysqlRep )
-			  prompt = "MariaDB ColumnStore Schema Sync feature is Enabled, do you want to leave enabled? [y,n] (y) > ";
-		  else
-			  prompt = "MariaDB ColumnStore Schema Sync feature, do you want to enable? [y,n] (y) > ";
-
-		  pcommand = callReadline(prompt.c_str());
-		  if (pcommand) {
-		      if (strlen(pcommand) > 0) answer = pcommand;
-		      callFree(pcommand);
-		  }
-
-		  if ( answer == "y" || answer == "n" ) {
-		      cout << endl;
-		      break;
-		  }
-		  else
-		      cout << "Invalid Entry, please enter 'y' for yes or 'n' for no" << endl;
-
-		  if ( noPrompting )
-			  exit(1);
-	    }
-
-	    if ( answer == "y" ) {
-		  mysqlRep = true;
-		MySQLRep = "y";
-	    }
-	    else
-	    {
-	      mysqlRep = false;
-	      MySQLRep = "n";
-	    }
-
-	    try {
-		  sysConfig->setConfig(InstallSection, "MySQLRep", MySQLRep);
-	    }
-	    catch(...)
-	    {}
-	}
-	else
-	{	//Schema Sync is default as on when Local Query is Selected
-		mysqlRep = true;
-		MySQLRep = "y";
-	      
-		try {
-		    sysConfig->setConfig(InstallSection, "MySQLRep", MySQLRep);
-		}
-		catch(...)
-		{}
-	}
-
 	if ( !writeConfig(sysConfig) ) { 
 		cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl; 
 		exit(1);