diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8850b8e..e09570e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,10 +25,7 @@
 else()
   message(STATUS "MPACT in-tree build.")
   # In-tree build with LLVM_EXTERNAL_PROJECTS=mpact
-
   option(MLIR_ENABLE_BINDINGS_PYTHON "Enables MLIR Python Bindings" OFF)
-
-  # TODO: Fix this upstream so that global include directories are not needed.
   set(MLIR_MAIN_SRC_DIR ${LLVM_MAIN_SRC_DIR}/../mlir)
   set(MLIR_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include)
   set(MLIR_GENERATED_INCLUDE_DIR ${LLVM_BINARY_DIR}/tools/mlir/include)
@@ -39,6 +36,7 @@
 include_directories(${MLIR_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+
 # Needed to build TorchMLIRExtensions.
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/externals/torch-mlir/include)
 
@@ -48,11 +46,6 @@
     $<BUILD_INTERFACE:${MPACT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${MPACT_BINARY_DIR}/include>
   )
-  # In LLVM parlance, the actual target may just be an interface and may not
-  # be responsible for actually compiling anything. The corresponding obj.
-  # target, when present, is just used for compilation and does not
-  # contribute to the interface properties.
-  # TODO: Normalize this upstream.
   target_include_directories(${target} PUBLIC ${_dirs})
   if(TARGET obj.${target})
     target_include_directories(obj.${target} PRIVATE ${_dirs})
diff --git a/setup.py b/setup.py
index 929ab41..17bdc0b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,3 @@
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-# Also available under a BSD-style license. See LICENSE.
-
 # Script for generating the mpact wheel.
 # ```
 # $ python setup.py bdist_wheel
@@ -28,6 +23,7 @@
 # directory that our CMake build produces. We go through quite a bit of effort
 # on the CMake side to organize that directory already, so we avoid duplicating
 # that here, and just package up its contents.
+
 import os
 import pathlib
 import shutil