diff --git a/Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/LibrarySubDirectory/SwiftTypeInSubDirectory.swift b/Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/LibrarySubDirectory/SwiftTypeInSubDirectory.swift
index 520c8c54..96b200e8 100644
--- a/Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/LibrarySubDirectory/SwiftTypeInSubDirectory.swift
+++ b/Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/LibrarySubDirectory/SwiftTypeInSubDirectory.swift
@@ -15,7 +15,7 @@
 public final class SwiftTypeInSubDirectory {
   public init() {}
 
-  public func hello() -> Int {
+  public func hello() -> Int64 {
     12
   }
 }
diff --git a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift
index ce70db0e..09de1778 100644
--- a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift
+++ b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift
@@ -92,8 +92,6 @@ extension FFMSwift2JavaGenerator {
           javaPackagePath: nil,
           filename: filename) {
           log.info("Done writing Swift thunks to: \(outputFile.absoluteString)")
-          // log.info("REMOVE FROM: \(expectedOutputSwiftFileNames)")
-          // log.info("REMOVE FROM THE: \(filename)")
           self.expectedOutputSwiftFileNames.remove(filename)
         }
       } catch {
diff --git a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift
index 33208450..a0f68ee0 100644
--- a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift
+++ b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift
@@ -64,10 +64,6 @@ package class FFMSwift2JavaGenerator: Swift2JavaGenerator {
     // It is sufficient to use file names only, since SwiftPM requires names to be unique within a module anyway.
     if translator.config.writeEmptyFiles ?? false {
       self.expectedOutputSwiftFileNames = Set(translator.inputs.compactMap { (input) -> String? in
-        // guard let filePathPart = input.path.split(separator: "/\(translator.swiftModuleName)/").last else {
-        //   return nil
-        // }
-        // return String(filePathPart.replacing(".swift", with: "+SwiftJava.swift"))
         guard let fileName = input.path.split(separator: PATH_SEPARATOR).last else {
           return nil
         }
diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
index da3936a7..7964723c 100644
--- a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
+++ b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
@@ -36,7 +36,6 @@ extension JNISwift2JavaGenerator {
     for expectedFileName in self.expectedOutputSwiftFileNames {
       logger.info("Write SwiftPM-'expected' empty file: \(expectedFileName.bold)")
 
-
       var printer = CodePrinter()
       printer.print("// Empty file generated on purpose")
       _ = try printer.writeContents(
diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator.swift
index 7f8a36b9..169d793d 100644
--- a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator.swift
+++ b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator.swift
@@ -71,10 +71,6 @@ package class JNISwift2JavaGenerator: Swift2JavaGenerator {
     // It is sufficient to use file names only, since SwiftPM requires names to be unique within a module anyway.
     if translator.config.writeEmptyFiles ?? false {
       self.expectedOutputSwiftFileNames = Set(translator.inputs.compactMap { (input) -> String? in
-        // guard let filePathPart = input.path.split(separator: "/\(translator.swiftModuleName)/").last else {
-        //   return nil
-        // }
-        // return String(filePathPart.replacing(".swift", with: "+SwiftJava.swift"))
         guard let fileName = input.path.split(separator: PATH_SEPARATOR).last else {
           return nil
         }
diff --git a/Sources/JExtractSwiftLib/Swift2Java.swift b/Sources/JExtractSwiftLib/Swift2Java.swift
index 43e168d5..30b6bd92 100644
--- a/Sources/JExtractSwiftLib/Swift2Java.swift
+++ b/Sources/JExtractSwiftLib/Swift2Java.swift
@@ -50,9 +50,6 @@ public struct SwiftToJava {
     log.info("Input paths = \(inputPaths)")
 
     let allFiles = collectAllFiles(suffix: ".swift", in: inputPaths, log: translator.log)
-    for f in allFiles {
-      log.warning("INPUT FILE: \(f) ->>>")
-    }
 
     // Register files to the translator.
     let fileManager = FileManager.default