diff --git a/test-harness/tests/specs/AmazonS3Spec.cfc b/test-harness/tests/specs/AmazonS3Spec.cfc
index 18a90a9..1589328 100644
--- a/test-harness/tests/specs/AmazonS3Spec.cfc
+++ b/test-harness/tests/specs/AmazonS3Spec.cfc
@@ -27,14 +27,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		prepareMock( s3 );
 		s3.$property( propertyName = "log", mock = createLogStub() );
 
-		// try {
 		s3.putBucket( testBucket );
-		// } catch ( any e ) {
-		//	writeDump(
-		//		var    = "Error putting test bucket, maybe cached: #e.message# #e.detail#",
-		//		output = "console"
-		//	);
-		// }
 	}
 
 	private function prepTmpFolder(){
@@ -98,7 +91,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
 						contentType = "auto"
 					);
 					var md = s3.getObjectInfo( testBucket, "example.txt" );
-					// debug( md );
+
 					expect( md ).notToBeEmpty();
 					expect( md[ "Content-Type" ] ).toBe( "text/plain" );
 				} );
@@ -120,7 +113,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
 					);
 					expect( resp.contains( "multipart" ) ).toBeTrue();
 					var md = s3.getObjectInfo( testBucket, uploadFileName );
-					// debug( md );
+
 					expect( md ).notToBeEmpty();
 					expect( md[ "Content-Length" ] ).toBe( fileSize );
 					expect( md[ "Content-Type" ] ).toBe( "text/plain" );
@@ -147,7 +140,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
 							"Hello, space world!"
 						);
 						var md = s3.getObjectInfo( testBucket, "Word Doc Tests.txt" );
-						// debug( md );
+
 						expect( md ).notToBeEmpty();
 					}
 				);
@@ -571,7 +564,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
 					var get = s3.getObject( testBucket, "presignedput.txt" );
 
 					expect( get.error ).toBeFalse();
-					// toString() since there is no content type set in thnis test, Adobe doesn't send back the file as a string, but a byte output stream
+					// toString() since there is no content type set in this test, Adobe doesn't send back the file as a string, but a byte output stream
 					expect( toString( get.response ) ).toBe( "Pre-Signed Put!" );
 				} );
 
diff --git a/test-harness/tests/specs/models/AmazonS3/buildKeyName.cfc b/test-harness/tests/specs/models/AmazonS3/buildKeyName.cfc
index 47a30da..ae5b676 100644
--- a/test-harness/tests/specs/models/AmazonS3/buildKeyName.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/buildKeyName.cfc
@@ -10,15 +10,9 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
-		// all your suites go here.
 		describe( "The buildKeyName function should...", function(){
 			beforeEach( function(){
 				uri                = mockData( $num = 1, $type = "words:1" )[ 1 ];
@@ -34,7 +28,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 					defaultBucketName      = mockdata( $num = 1, $type = "words:1" )[ 1 ],
 					defaultObjectOwnership = mockdata( $num = 1, $type = "words:1" )[ 1 ]
 				);
-				// = getInstance("AmazonS3@s3sdk");
 			} );
 			it( "If the urlStyle is path and a bucket is submitted, return bucket\uri", function(){
 				testObj.setUrlStyle( "path" );
diff --git a/test-harness/tests/specs/models/AmazonS3/buildUrlEndpoint.cfc b/test-harness/tests/specs/models/AmazonS3/buildUrlEndpoint.cfc
index 2d49216..23d59a5 100644
--- a/test-harness/tests/specs/models/AmazonS3/buildUrlEndpoint.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/buildUrlEndpoint.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
diff --git a/test-harness/tests/specs/models/AmazonS3/createSignatureUtil.cfc b/test-harness/tests/specs/models/AmazonS3/createSignatureUtil.cfc
index 877f6da..10d265c 100644
--- a/test-harness/tests/specs/models/AmazonS3/createSignatureUtil.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/createSignatureUtil.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
diff --git a/test-harness/tests/specs/models/AmazonS3/getBucketLocation.cfc b/test-harness/tests/specs/models/AmazonS3/getBucketLocation.cfc
index baaae8e..c91b581 100644
--- a/test-harness/tests/specs/models/AmazonS3/getBucketLocation.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/getBucketLocation.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
diff --git a/test-harness/tests/specs/models/AmazonS3/init.cfc b/test-harness/tests/specs/models/AmazonS3/init.cfc
index c10ac2b..2a39fed 100644
--- a/test-harness/tests/specs/models/AmazonS3/init.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/init.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
diff --git a/test-harness/tests/specs/models/AmazonS3/requireBucketName.cfc b/test-harness/tests/specs/models/AmazonS3/requireBucketName.cfc
index 3f29891..3c3f8d2 100644
--- a/test-harness/tests/specs/models/AmazonS3/requireBucketName.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/requireBucketName.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
diff --git a/test-harness/tests/specs/models/AmazonS3/setAuth.cfc b/test-harness/tests/specs/models/AmazonS3/setAuth.cfc
index 8571b02..00e075b 100644
--- a/test-harness/tests/specs/models/AmazonS3/setAuth.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/setAuth.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
diff --git a/test-harness/tests/specs/models/AmazonS3/setAwsDomain.cfc b/test-harness/tests/specs/models/AmazonS3/setAwsDomain.cfc
index 3bfad87..65c68a9 100644
--- a/test-harness/tests/specs/models/AmazonS3/setAwsDomain.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/setAwsDomain.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
diff --git a/test-harness/tests/specs/models/AmazonS3/setAwsRegion.cfc b/test-harness/tests/specs/models/AmazonS3/setAwsRegion.cfc
index b373cec..cff6327 100644
--- a/test-harness/tests/specs/models/AmazonS3/setAwsRegion.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/setAwsRegion.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
diff --git a/test-harness/tests/specs/models/AmazonS3/setSSL.cfc b/test-harness/tests/specs/models/AmazonS3/setSSL.cfc
index 4e47871..3908414 100644
--- a/test-harness/tests/specs/models/AmazonS3/setSSL.cfc
+++ b/test-harness/tests/specs/models/AmazonS3/setSSL.cfc
@@ -10,11 +10,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 	}
 
-	// executes after all suites+specs in the run() method
-	// function afterAll(){
-
-	// }
-
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){