diff --git a/kafka-connect-aws-s3/src/it/scala/io/lenses/streamreactor/connect/aws/s3/source/TempFileHelper.scala b/kafka-connect-aws-s3/src/it/scala/io/lenses/streamreactor/connect/aws/s3/source/TempFileHelper.scala
index b5f3dc411..f221ef911 100644
--- a/kafka-connect-aws-s3/src/it/scala/io/lenses/streamreactor/connect/aws/s3/source/TempFileHelper.scala
+++ b/kafka-connect-aws-s3/src/it/scala/io/lenses/streamreactor/connect/aws/s3/source/TempFileHelper.scala
@@ -10,7 +10,9 @@ trait TempFileHelper {
     val folder     = new File(folderName)
     try {
       folder.mkdir()
+      folder.deleteOnExit()
       val file = new File(folder, fileName)
+      file.deleteOnExit()
       f(file)
     } catch {
       case e: Throwable => Left(e)
diff --git a/kafka-connect-cloud-common/src/main/scala/io/lenses/streamreactor/connect/cloud/common/sink/writer/WriteState.scala b/kafka-connect-cloud-common/src/main/scala/io/lenses/streamreactor/connect/cloud/common/sink/writer/WriteState.scala
index f53cf72ff..6e09c037c 100644
--- a/kafka-connect-cloud-common/src/main/scala/io/lenses/streamreactor/connect/cloud/common/sink/writer/WriteState.scala
+++ b/kafka-connect-cloud-common/src/main/scala/io/lenses/streamreactor/connect/cloud/common/sink/writer/WriteState.scala
@@ -50,7 +50,6 @@ case class Writing(
 ) extends WriteState(commitState)
     with LazyLogging {
 
-  //TODO: it's not clear why we are only keeping track of one schema (VALUE) and not key/and headers
   def update(o: Offset, recordTimestamp: Long, schema: Option[Schema]): WriteState = {
     logger.debug(
       s"state update: Uncommitted offset update $uncommittedOffset => $o, earliest record timestamp $earliestRecordTimestamp => $recordTimestamp",