diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index 98a7e4a02..38e21cb8b 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -191,12 +191,6 @@ mkdir -p $hdfsDir >/dev/null 2>&1
 #create mount directories
 mkdir /mnt/tmp > /dev/null 2>&1
 
-#create shared memory if non-root
-if [ $user != "root" ]; then
-	mkdir -p ${installdir}/dev/shm
-	chmod 666 ${installdir}/dev/shm
-fi
-
 # remove mysql archive log
 test -d $installdir/mysql/db || mkdir -p $installdir/mysql/db
 rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 688424f1e..b70bb1552 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -1888,8 +1888,6 @@ static void statusControlThread()
     //
     
     string shmLocation = "/dev/shm/";
-	if ( !rootUser) 
-		shmLocation = startup::StartUp::installDir() + "/dev/shm/";
     
     PROCSTATshmsize = MAX_PROCESS * sizeof(shmProcessStatus);
     bool memInit = true;
diff --git a/utils/rwlock/rwlock.cpp b/utils/rwlock/rwlock.cpp
index 4ffec938f..bba7f2505 100644
--- a/utils/rwlock/rwlock.cpp
+++ b/utils/rwlock/rwlock.cpp
@@ -153,8 +153,6 @@ RWLockShmImpl::RWLockShmImpl(int key, bool excl)
         rootUser = false;
 
     string shmLocation = "/dev/shm/";
-	if ( !rootUser) 
-		shmLocation = startup::StartUp::installDir() + "/dev/shm/";
 
     try
     {
diff --git a/versioning/BRM/brmshmimpl.cpp b/versioning/BRM/brmshmimpl.cpp
index 38584760e..6b86d2d37 100644
--- a/versioning/BRM/brmshmimpl.cpp
+++ b/versioning/BRM/brmshmimpl.cpp
@@ -56,8 +56,6 @@ BRMShmImpl::BRMShmImpl(unsigned key, off_t size, bool readOnly) :
         rootUser = false;
 
     string shmLocation = "/dev/shm/";
-	if ( !rootUser) 
-		shmLocation = startup::StartUp::installDir() + "/dev/shm/";
 
     if (fSize == 0)
     {
diff --git a/versioning/BRM/mastersegmenttable.cpp b/versioning/BRM/mastersegmenttable.cpp
index 0abf81c0c..34fca9451 100644
--- a/versioning/BRM/mastersegmenttable.cpp
+++ b/versioning/BRM/mastersegmenttable.cpp
@@ -85,8 +85,6 @@ MasterSegmentTableImpl::MasterSegmentTableImpl(int key, int size)
         rootUser = false;
 
     string shmLocation = "/dev/shm/";
-	if ( !rootUser) 
-		shmLocation = startup::StartUp::installDir() + "/dev/shm/";
 
     try
     {