diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8e1a29ee347ea15e58427de5117189bccb1aea5..09a156cacbb1aee26de4269012e81a118e7af15e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,8 +46,6 @@ set (CMAKE_CUDA_EXTENSIONS OFF)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g  -O3")
 set (CMAKE_CXX_FLAGS_RELEASE "-g -O3 ")
-#set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 -g")
-#set (CMAKE_CXX_FLAGS_RELEASE "-O0")
 set (CMAKE_CXX_FLAGS_DEBUG  "-g")
 
 if (NOT "${IPPL_PLATFORMS}" STREQUAL "CUDA" AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
@@ -65,10 +63,6 @@ message (STATUS "CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
 add_definitions (-DNOCTAssert)
 
 #add_compile_options (-ferror-limit=1)
-
-#add_compile_options (-Wno-deprecated-declarations)
-#add_compile_options (-Wno-unused)
-#add_compile_options (-Wextra)
 add_compile_options (-Wno-error=uninitialized)
 add_compile_options (-Wno-error=restrict)
 add_compile_options (-Wno-error=unused-function)
@@ -92,22 +86,6 @@ message (STATUS "The C++ compiler version is: ${CMAKE_CXX_COMPILER_VERSION}")
 message (STATUS "The MPI C++ compiler is: ${MPI_CXX_COMPILER}")
 message (STATUS "The underlying C++ compiler is: ${CMAKE_CXX_COMPILER}")
 
-#find_package(Heffte 2.2.0 REQUIRED)
-#message (STATUS "Found Heffte_DIR: ${Heffte_DIR}")
-#find_library(HEFFTE_LIBRARY heffte HINTS ${Heffte_DIR}/../..)
-#message (STATUS "Found HEFFTE lib: ${HEFFTE_LIBRARY}")
-#
-#
-#find_package(Kokkos REQUIRED)
-#message (STATUS "Found Kokkos_DIR: ${Kokkos_DIR}")
-#if ("${Kokkos_DEVICES}" MATCHES "CUDA")
-#    set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g -G --diag-suppress=20011")
-#endif()
-#find_library(KOKKOS_LIBRARY1 NAMES kokkoscore HINTS ${Kokkos_DIR}/../..)
-#find_library(KOKKOS_LIBRARY2 NAMES kokkoscontainers HINTS ${Kokkos_DIR}/../..)
-#find_library(KOKKOS_LIBRARY3 NAMES kokkossimd HINTS ${Kokkos_DIR}/../..)
-#message (STATUS "Found Kokkos lib: ${KOKKOS_LIBRARY1}:${KOKKOS_LIBRARY2}:${KOKKOS_LIBRARY3}")
-
 message (STATUS "Found IPPL_DIR: ${IPPL_DIR}")
 if(NOT IPPL_VERSION)
     set(IPPL_VERSION "3.2.0")
@@ -121,7 +99,6 @@ FetchContent_Declare(ippl
 )
 FetchContent_MakeAvailable(ippl)
 include_directories("${IPPL_SOURCE_DIR}/src")
-#find_library(IPPL_LIBRARY ippl HINTS ${IPPL_LIBRARY_DIR}) 
 
 message (STATUS "Found Ippl_INC: ${IPPL_INCLUDE_DIR}")
 message (STATUS "Found Ippl_LIB: ${IPPL_LIBRARY}")
diff --git a/src/PartBunch/#[-Wunused-variable]# b/src/PartBunch/#[-Wunused-variable]#
deleted file mode 100644
index 091276e8d88504da43085e1b5da7541ad81073bd..0000000000000000000000000000000000000000
--- a/src/PartBunch/#[-Wunused-variable]#
+++ /dev/null
@@ -1,2 +0,0 @@
-  499 |     int tag = 101;
-  
\ No newline at end of file