diff --git a/examples/LegacyPassManager/HelloWorld/HelloWorld.cpp b/examples/LegacyPassManager/HelloWorld/HelloWorld.cpp
index a8961771e0..65e0620ac5 100644
--- a/examples/LegacyPassManager/HelloWorld/HelloWorld.cpp
+++ b/examples/LegacyPassManager/HelloWorld/HelloWorld.cpp
@@ -10,7 +10,6 @@
 #include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Transforms/IPO/PassManagerBuilder.h"
 
-//#include "Common/clambc.h"
 using namespace llvm;
 
 namespace
diff --git a/examples/PassManager/AnalysisPlugin/AnalysisPlugin.cpp b/examples/PassManager/AnalysisPlugin/AnalysisPlugin.cpp
index 2c013a5644..1ecde20d59 100644
--- a/examples/PassManager/AnalysisPlugin/AnalysisPlugin.cpp
+++ b/examples/PassManager/AnalysisPlugin/AnalysisPlugin.cpp
@@ -20,9 +20,6 @@
  *  MA 02110-1301, USA.
  */
 
-//#include "Common/clambc.h"
-//#include "Common/ClamBCUtilities.h"
-
 #include <llvm/IR/Module.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/Support/raw_ostream.h>
diff --git a/examples/PassManager/CMakeLists.txt b/examples/PassManager/CMakeLists.txt
index ec133b4ea2..327f568880 100644
--- a/examples/PassManager/CMakeLists.txt
+++ b/examples/PassManager/CMakeLists.txt
@@ -1,4 +1,3 @@
-# Copyright (C) 2021 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
-
+# Copyright (C) 2021-2014 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
 
 add_subdirectory(AnalysisPlugin)
diff --git a/libclambcc/ClamBCRemoveFreezeInsts/ClamBCRemoveFreezeInsts.cpp b/libclambcc/ClamBCRemoveFreezeInsts/ClamBCRemoveFreezeInsts.cpp
index 1d3607570a..a58b2516c9 100644
--- a/libclambcc/ClamBCRemoveFreezeInsts/ClamBCRemoveFreezeInsts.cpp
+++ b/libclambcc/ClamBCRemoveFreezeInsts/ClamBCRemoveFreezeInsts.cpp
@@ -38,10 +38,10 @@ using namespace std;
 namespace
 {
 /*
-     * Freeze Instructions are to guarantee sane behaviour in the case of undefs or poison values. The interpreter 
-     * has no notion of freeze instructions, so we are removing them.  The verifier will fail if there are undef or
-     * poison values in the IR, so this is safe to do.
-     */
+ * Freeze Instructions are to guarantee sane behaviour in the case of undefs or poison values. The interpreter 
+ * has no notion of freeze instructions, so we are removing them.  The verifier will fail if there are undef or
+ * poison values in the IR, so this is safe to do.
+ */
 struct ClamBCRemoveFreezeInsts : public PassInfoMixin<ClamBCRemoveFreezeInsts> {
   protected:
     Module *pMod  = nullptr;
diff --git a/libclambcc/ClamBCRemoveUSUB/ClamBCRemoveUSUB.cpp b/libclambcc/ClamBCRemoveUSUB/ClamBCRemoveUSUB.cpp
index 2888d5c2a4..976d8f81b5 100644
--- a/libclambcc/ClamBCRemoveUSUB/ClamBCRemoveUSUB.cpp
+++ b/libclambcc/ClamBCRemoveUSUB/ClamBCRemoveUSUB.cpp
@@ -38,8 +38,8 @@ using namespace std;
 namespace
 {
 /*
-     * Remove usub intrinsic because it's not supported by our runtime.
-     */
+ * Remove usub intrinsic because it's not supported by our runtime.
+ */
 struct ClamBCRemoveUSUB : public PassInfoMixin<ClamBCRemoveUSUB> {
   protected:
     Module *pMod                = nullptr;
diff --git a/libclambcc/ClamBCRemoveUnsupportedICMPIntrinsics/ClamBCRemoveUnsupportedICMPIntrinsics.cpp b/libclambcc/ClamBCRemoveUnsupportedICMPIntrinsics/ClamBCRemoveUnsupportedICMPIntrinsics.cpp
index 9a7ae73374..4ede0dc0a4 100644
--- a/libclambcc/ClamBCRemoveUnsupportedICMPIntrinsics/ClamBCRemoveUnsupportedICMPIntrinsics.cpp
+++ b/libclambcc/ClamBCRemoveUnsupportedICMPIntrinsics/ClamBCRemoveUnsupportedICMPIntrinsics.cpp
@@ -38,8 +38,8 @@ using namespace std;
 namespace
 {
 /*
-     * Remove smin intrinsic because it's not supported by our runtime.
-     */
+ * Remove smin intrinsic because it's not supported by our runtime.
+ */
 struct ClamBCRemoveUnsupportedICMPIntrinsics : public PassInfoMixin<ClamBCRemoveUnsupportedICMPIntrinsics> {
   protected:
     Module *pMod = nullptr;