diff --git a/config/server.properties b/config/server.properties
index aebcb87ca9e46..d1b1753132bff 100644
--- a/config/server.properties
+++ b/config/server.properties
@@ -12,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 # see kafka.server.KafkaConfig for additional details and defaults
 
 ############################# Server Basics #############################
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index 10163a02b5a83..7975b8f1224b3 100644
--- a/tests/kafkatest/__init__.py
+++ b/tests/kafkatest/__init__.py
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 # This determines the version of kafkatest that can be published to PyPi and installed with pip
 #
diff --git a/tests/kafkatest/benchmarks/core/__init__.py b/tests/kafkatest/benchmarks/core/__init__.py
index ebc9bb3a9a03f..ec2014340d78f 100644
--- a/tests/kafkatest/benchmarks/core/__init__.py
+++ b/tests/kafkatest/benchmarks/core/__init__.py
@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
diff --git a/tests/kafkatest/benchmarks/streams/__init__.py b/tests/kafkatest/benchmarks/streams/__init__.py
index ebc9bb3a9a03f..ec2014340d78f 100644
--- a/tests/kafkatest/benchmarks/streams/__init__.py
+++ b/tests/kafkatest/benchmarks/streams/__init__.py
@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
diff --git a/tests/kafkatest/services/__init__.py b/tests/kafkatest/services/__init__.py
index ebc9bb3a9a03f..ec2014340d78f 100644
--- a/tests/kafkatest/services/__init__.py
+++ b/tests/kafkatest/services/__init__.py
@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
diff --git a/tests/kafkatest/services/kafka/config.py b/tests/kafkatest/services/kafka/config.py
index 8ea16626ec773..1b81b43e50454 100644
--- a/tests/kafkatest/services/kafka/config.py
+++ b/tests/kafkatest/services/kafka/config.py
@@ -46,8 +46,3 @@ def render(self):
             s += "%s=%s\n" % (k, str(self[k]))
         return s
 
-
-
-
-
-
diff --git a/tests/kafkatest/services/kafka/templates/kafka.properties b/tests/kafkatest/services/kafka/templates/kafka.properties
index 4408144516a9b..9924aebb2dc9d 100644
--- a/tests/kafkatest/services/kafka/templates/kafka.properties
+++ b/tests/kafkatest/services/kafka/templates/kafka.properties
@@ -12,9 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
-
 
+# see kafka.server.KafkaConfig for additional details and defaults
 advertised.host.name={{ node.account.hostname }}
 
 
diff --git a/tests/kafkatest/services/templates/console_consumer.properties b/tests/kafkatest/services/templates/console_consumer.properties
index c733f479b86d7..4bac01f3441d7 100644
--- a/tests/kafkatest/services/templates/console_consumer.properties
+++ b/tests/kafkatest/services/templates/console_consumer.properties
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 group.id={{ group_id|default('test-consumer-group') }}
 
diff --git a/tests/kafkatest/services/templates/zookeeper.properties b/tests/kafkatest/services/templates/zookeeper.properties
index e66c53f728875..6048f31ce0eb6 100644
--- a/tests/kafkatest/services/templates/zookeeper.properties
+++ b/tests/kafkatest/services/templates/zookeeper.properties
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 dataDir=/mnt/zookeeper
 clientPort=2181
@@ -22,4 +21,4 @@ syncLimit=2
 quorumListenOnAllIPs=true
 {% for node in nodes %}
 server.{{ loop.index }}={{ node.account.hostname }}:2888:3888
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/tests/kafkatest/tests/__init__.py b/tests/kafkatest/tests/__init__.py
index ebc9bb3a9a03f..ec2014340d78f 100644
--- a/tests/kafkatest/tests/__init__.py
+++ b/tests/kafkatest/tests/__init__.py
@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
diff --git a/tests/kafkatest/tests/client/__init__.py b/tests/kafkatest/tests/client/__init__.py
index ebc9bb3a9a03f..ec2014340d78f 100644
--- a/tests/kafkatest/tests/client/__init__.py
+++ b/tests/kafkatest/tests/client/__init__.py
@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
diff --git a/tests/kafkatest/tests/connect/__init__.py b/tests/kafkatest/tests/connect/__init__.py
index ebc9bb3a9a03f..ec2014340d78f 100644
--- a/tests/kafkatest/tests/connect/__init__.py
+++ b/tests/kafkatest/tests/connect/__init__.py
@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
diff --git a/tests/kafkatest/tests/core/__init__.py b/tests/kafkatest/tests/core/__init__.py
index ebc9bb3a9a03f..ec2014340d78f 100644
--- a/tests/kafkatest/tests/core/__init__.py
+++ b/tests/kafkatest/tests/core/__init__.py
@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
diff --git a/tests/kafkatest/tests/tools/__init__.py b/tests/kafkatest/tests/tools/__init__.py
index ebc9bb3a9a03f..ec2014340d78f 100644
--- a/tests/kafkatest/tests/tools/__init__.py
+++ b/tests/kafkatest/tests/tools/__init__.py
@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
diff --git a/tests/kafkatest/utils/__init__.py b/tests/kafkatest/utils/__init__.py
index ec224d830b32d..66180162bcaf6 100644
--- a/tests/kafkatest/utils/__init__.py
+++ b/tests/kafkatest/utils/__init__.py
@@ -12,6 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 from util import kafkatest_version, is_version, is_int, is_int_with_prefix
diff --git a/tests/setup.py b/tests/setup.py
index dd750dcc4d5dc..848ca04e4250f 100644
--- a/tests/setup.py
+++ b/tests/setup.py
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 import re
 import sys
diff --git a/vagrant/aws/aws-access-keys-commands b/vagrant/aws/aws-access-keys-commands
index 9c923f86f3f8f..2c69d296477b9 100644
--- a/vagrant/aws/aws-access-keys-commands
+++ b/vagrant/aws/aws-access-keys-commands
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 if [ -z "$AWS_IAM" ];then
     echo "Warning: AWS_IAM is not set"
diff --git a/vagrant/aws/aws-example-Vagrantfile.local b/vagrant/aws/aws-example-Vagrantfile.local
index 853671eb6f3ab..ee9db9a616ba6 100644
--- a/vagrant/aws/aws-example-Vagrantfile.local
+++ b/vagrant/aws/aws-example-Vagrantfile.local
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 # Use this template Vagrantfile.local for running system tests on aws 
 # To use it, move it to the base kafka directory and rename
diff --git a/vagrant/aws/aws-init.sh b/vagrant/aws/aws-init.sh
index 60fa653bbc696..c0a6f677f0e5b 100755
--- a/vagrant/aws/aws-init.sh
+++ b/vagrant/aws/aws-init.sh
@@ -13,7 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 # This script can be used to set up a driver machine on aws from which you will run tests
 # or bring up your mini Kafka cluster.
diff --git a/vagrant/system-test-Vagrantfile.local b/vagrant/system-test-Vagrantfile.local
index 334ac85758de8..898c02e772041 100644
--- a/vagrant/system-test-Vagrantfile.local
+++ b/vagrant/system-test-Vagrantfile.local
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
 
 # Use this example Vagrantfile.local for running system tests
 # To use it, move it to the base kafka directory and rename
@@ -24,4 +23,4 @@ base_box = "kafkatest-worker"
 
 
 # System tests use hostnames for each worker that need to be defined in /etc/hosts on the host running ducktape
-enable_dns = true
\ No newline at end of file
+enable_dns = true