diff --git a/gz-waves-models/world_models/regular_waves_3s_1m/model.config b/gz-waves-models/world_models/regular_waves_3s_1m/model.config
index 6d623a32..29064b6b 100644
--- a/gz-waves-models/world_models/regular_waves_3s_1m/model.config
+++ b/gz-waves-models/world_models/regular_waves_3s_1m/model.config
@@ -1,7 +1,7 @@
 
 <?xml version='1.0'?>
 <model>
-  <name>Regular Waves 3s 1m</name>
+  <name>Regular Waves</name>
   <version>1.0</version>
   <sdf version='1.6'>model.sdf</sdf>
 
@@ -11,8 +11,8 @@
   </author>
 
   <description>
-    Regular surface waves T=3s, H=1m.
-
+    Regular surface waves. i.e. plane progressive waves of a single frequency.
+    
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>
diff --git a/gz_waves_bridge/test/test_copyright.py b/gz_waves_bridge/test/test_copyright.py
deleted file mode 100644
index 97a39196..00000000
--- a/gz_waves_bridge/test/test_copyright.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2015 Open Source Robotics Foundation, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-from ament_copyright.main import main
-import pytest
-
-
-# Remove the `skip` decorator once the source file(s) have a copyright header
-@pytest.mark.skip(reason='No copyright header has been placed in the generated source file.')
-@pytest.mark.copyright
-@pytest.mark.linter
-def test_copyright():
-    rc = main(argv=['.', 'test'])
-    assert rc == 0, 'Found errors'
diff --git a/gz_waves_bridge/test/test_flake8.py b/gz_waves_bridge/test/test_flake8.py
deleted file mode 100644
index 27ee1078..00000000
--- a/gz_waves_bridge/test/test_flake8.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 Open Source Robotics Foundation, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-from ament_flake8.main import main_with_errors
-import pytest
-
-
-@pytest.mark.flake8
-@pytest.mark.linter
-def test_flake8():
-    rc, errors = main_with_errors(argv=[])
-    assert rc == 0, \
-        'Found %d code style errors / warnings:\n' % len(errors) + \
-        '\n'.join(errors)
diff --git a/gz_waves_bridge/test/test_pep257.py b/gz_waves_bridge/test/test_pep257.py
deleted file mode 100644
index b234a384..00000000
--- a/gz_waves_bridge/test/test_pep257.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2015 Open Source Robotics Foundation, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-from ament_pep257.main import main
-import pytest
-
-
-@pytest.mark.linter
-@pytest.mark.pep257
-def test_pep257():
-    rc = main(argv=['.', 'test'])
-    assert rc == 0, 'Found code style errors / warnings'