diff --git a/opt.cpp b/opt.cpp
index 11829923..9f2599a5 100644
--- a/opt.cpp
+++ b/opt.cpp
@@ -516,6 +516,9 @@ Optimize(llvm::Module *module, int optLevel) {
         llvm::initializeInstrumentation(*registry);
         llvm::initializeTarget(*registry);
 
+        if (g->target->getISA() == Target::NVPTX)
+          optPM.add(CreatePromoteLocalToPrivatePass());
+#if 1
         optPM.add(llvm::createGlobalDCEPass(), 185);
 
         // Setup to use LLVM default AliasAnalysis
@@ -575,9 +578,6 @@ Optimize(llvm::Module *module, int optLevel) {
         optPM.add(llvm::createReassociatePass());
         optPM.add(llvm::createIPConstantPropagationPass());
         optPM.add(CreateReplaceStdlibShiftPass(),229);
-        if (g->target->getISA() == Target::NVPTX)
-          optPM.add(CreatePromoteLocalToPrivatePass());
-#if 1
         optPM.add(llvm::createDeadArgEliminationPass(),230);
         optPM.add(llvm::createInstructionCombiningPass());
         optPM.add(llvm::createCFGSimplificationPass());
diff --git a/stmt.cpp b/stmt.cpp
index 3ebefc06..8b1c6303 100644
--- a/stmt.cpp
+++ b/stmt.cpp
@@ -334,7 +334,7 @@ DeclStmt::EmitCode(FunctionEmitContext *ctx) const {
            * constant uniform are automatically promoted to varying 
            */
            !sym->type->IsConstType() &&
-#if 0     
+#if 1     
            sym->type->IsArrayType() &&
 #endif
            g->target->getISA() == Target::NVPTX)