diff --git a/src/MCPClient/lib/archivematicaClient.py b/src/MCPClient/lib/archivematicaClient.py
index d54c001139..fc1eb8382e 100755
--- a/src/MCPClient/lib/archivematicaClient.py
+++ b/src/MCPClient/lib/archivematicaClient.py
@@ -46,9 +46,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClient
-# @author Joseph Perry <joseph@artefactual.com>
 import configparser
 import logging
 import os
diff --git a/src/MCPClient/lib/archivematicaClientModules b/src/MCPClient/lib/archivematicaClientModules
index d955a7bbef..a432bf8088 100644
--- a/src/MCPClient/lib/archivematicaClientModules
+++ b/src/MCPClient/lib/archivematicaClientModules
@@ -15,10 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
 
-# @package Archivematica
-# @subpackage Ingest
-# @author Joseph Perry <joseph@artefactual.com>
-# @version svn: $Id$
 
 #!!! this is a list of supported commands/tasks, not modules
 #the version numbers are versions of the protocol, not versions of the programs themselves.
diff --git a/src/MCPClient/lib/clientScripts/archivematicaCreateMETSMetadataCSV.py b/src/MCPClient/lib/clientScripts/archivematicaCreateMETSMetadataCSV.py
index ff9ccfcb28..57fb1130e0 100755
--- a/src/MCPClient/lib/clientScripts/archivematicaCreateMETSMetadataCSV.py
+++ b/src/MCPClient/lib/clientScripts/archivematicaCreateMETSMetadataCSV.py
@@ -16,10 +16,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.    If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
-# @version svn: $Id$
 # /src/dashboard/src/main/models.py
 import collections
 import csv
diff --git a/src/MCPClient/lib/clientScripts/archivematicaCreateMETSRights.py b/src/MCPClient/lib/clientScripts/archivematicaCreateMETSRights.py
index 26fd5409d7..cab039e02d 100755
--- a/src/MCPClient/lib/clientScripts/archivematicaCreateMETSRights.py
+++ b/src/MCPClient/lib/clientScripts/archivematicaCreateMETSRights.py
@@ -16,9 +16,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.    If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 # /src/dashboard/src/main/models.py
 import sys
 import uuid
diff --git a/src/MCPClient/lib/clientScripts/archivematicaCreateMETSRightsDspaceMDRef.py b/src/MCPClient/lib/clientScripts/archivematicaCreateMETSRightsDspaceMDRef.py
index 84a9665ad5..229bad2b33 100755
--- a/src/MCPClient/lib/clientScripts/archivematicaCreateMETSRightsDspaceMDRef.py
+++ b/src/MCPClient/lib/clientScripts/archivematicaCreateMETSRightsDspaceMDRef.py
@@ -16,9 +16,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.    If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 
diff --git a/src/MCPClient/lib/clientScripts/archivematicaCreateMETSTrim.py b/src/MCPClient/lib/clientScripts/archivematicaCreateMETSTrim.py
index aceecb7e30..ef908132ac 100755
--- a/src/MCPClient/lib/clientScripts/archivematicaCreateMETSTrim.py
+++ b/src/MCPClient/lib/clientScripts/archivematicaCreateMETSTrim.py
@@ -16,10 +16,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.    If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
-# @version svn: $Id$
 import os
 import sys
 from datetime import datetime
diff --git a/src/MCPClient/lib/clientScripts/bag_with_empty_directories.py b/src/MCPClient/lib/clientScripts/bag_with_empty_directories.py
index dccb7973b7..80e72fe68a 100755
--- a/src/MCPClient/lib/clientScripts/bag_with_empty_directories.py
+++ b/src/MCPClient/lib/clientScripts/bag_with_empty_directories.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import argparse
 import multiprocessing
 import os
diff --git a/src/MCPClient/lib/clientScripts/change_names.py b/src/MCPClient/lib/clientScripts/change_names.py
index 96655da16f..3ed60176f8 100755
--- a/src/MCPClient/lib/clientScripts/change_names.py
+++ b/src/MCPClient/lib/clientScripts/change_names.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage MCPClient
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import re
 import shutil
diff --git a/src/MCPClient/lib/clientScripts/change_object_names.py b/src/MCPClient/lib/clientScripts/change_object_names.py
index 7d69cc67f2..1614054c38 100755
--- a/src/MCPClient/lib/clientScripts/change_object_names.py
+++ b/src/MCPClient/lib/clientScripts/change_object_names.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import unicodedata
 import uuid
diff --git a/src/MCPClient/lib/clientScripts/change_sip_name.py b/src/MCPClient/lib/clientScripts/change_sip_name.py
index 8c957f0804..0eb9eecdc9 100755
--- a/src/MCPClient/lib/clientScripts/change_sip_name.py
+++ b/src/MCPClient/lib/clientScripts/change_sip_name.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 
diff --git a/src/MCPClient/lib/clientScripts/check_for_access_directory.py b/src/MCPClient/lib/clientScripts/check_for_access_directory.py
index 27f926dc2c..4ccdf81054 100755
--- a/src/MCPClient/lib/clientScripts/check_for_access_directory.py
+++ b/src/MCPClient/lib/clientScripts/check_for_access_directory.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 from optparse import OptionParser
diff --git a/src/MCPClient/lib/clientScripts/check_for_service_directory.py b/src/MCPClient/lib/clientScripts/check_for_service_directory.py
index 8fc4a16b5a..76eee31f10 100755
--- a/src/MCPClient/lib/clientScripts/check_for_service_directory.py
+++ b/src/MCPClient/lib/clientScripts/check_for_service_directory.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import re
 from optparse import OptionParser
diff --git a/src/MCPClient/lib/clientScripts/check_for_submission_documentation.py b/src/MCPClient/lib/clientScripts/check_for_submission_documentation.py
index 98a56fdd12..7df5ecb9fe 100755
--- a/src/MCPClient/lib/clientScripts/check_for_submission_documentation.py
+++ b/src/MCPClient/lib/clientScripts/check_for_submission_documentation.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 
diff --git a/src/MCPClient/lib/clientScripts/check_transfer_directory_for_objects.py b/src/MCPClient/lib/clientScripts/check_transfer_directory_for_objects.py
index 49cc2fe6e9..9d95aad567 100755
--- a/src/MCPClient/lib/clientScripts/check_transfer_directory_for_objects.py
+++ b/src/MCPClient/lib/clientScripts/check_transfer_directory_for_objects.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 
 
diff --git a/src/MCPClient/lib/clientScripts/copy_thumbnails_to_dip_directory.py b/src/MCPClient/lib/clientScripts/copy_thumbnails_to_dip_directory.py
index 601c36165c..6e0396d2a1 100755
--- a/src/MCPClient/lib/clientScripts/copy_thumbnails_to_dip_directory.py
+++ b/src/MCPClient/lib/clientScripts/copy_thumbnails_to_dip_directory.py
@@ -15,8 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
 import os
 import shutil
 
diff --git a/src/MCPClient/lib/clientScripts/copy_transfer_submission_documentation.py b/src/MCPClient/lib/clientScripts/copy_transfer_submission_documentation.py
index 085437f4f5..f5f2399304 100755
--- a/src/MCPClient/lib/clientScripts/copy_transfer_submission_documentation.py
+++ b/src/MCPClient/lib/clientScripts/copy_transfer_submission_documentation.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import re
 import shutil
diff --git a/src/MCPClient/lib/clientScripts/copy_transfers_metadata_and_logs.py b/src/MCPClient/lib/clientScripts/copy_transfers_metadata_and_logs.py
index badc8cb841..5ba0874ff9 100755
--- a/src/MCPClient/lib/clientScripts/copy_transfers_metadata_and_logs.py
+++ b/src/MCPClient/lib/clientScripts/copy_transfers_metadata_and_logs.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import shutil
 import traceback
diff --git a/src/MCPClient/lib/clientScripts/create_event.py b/src/MCPClient/lib/clientScripts/create_event.py
index 65b78f357d..b026757a05 100755
--- a/src/MCPClient/lib/clientScripts/create_event.py
+++ b/src/MCPClient/lib/clientScripts/create_event.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import uuid
 from optparse import OptionParser
 
diff --git a/src/MCPClient/lib/clientScripts/create_mets_v2.py b/src/MCPClient/lib/clientScripts/create_mets_v2.py
index 48865fc03d..70fa08fa25 100755
--- a/src/MCPClient/lib/clientScripts/create_mets_v2.py
+++ b/src/MCPClient/lib/clientScripts/create_mets_v2.py
@@ -16,9 +16,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.    If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import collections
 import copy
 import os
diff --git a/src/MCPClient/lib/clientScripts/create_sip_from_transfer_objects.py b/src/MCPClient/lib/clientScripts/create_sip_from_transfer_objects.py
index 2f6d58389f..a9f769d495 100755
--- a/src/MCPClient/lib/clientScripts/create_sip_from_transfer_objects.py
+++ b/src/MCPClient/lib/clientScripts/create_sip_from_transfer_objects.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import shutil
 import sys
diff --git a/src/MCPClient/lib/clientScripts/create_sips_from_trim_transfer_containers.py b/src/MCPClient/lib/clientScripts/create_sips_from_trim_transfer_containers.py
index 4f7b85faa0..564fb501b2 100755
--- a/src/MCPClient/lib/clientScripts/create_sips_from_trim_transfer_containers.py
+++ b/src/MCPClient/lib/clientScripts/create_sips_from_trim_transfer_containers.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import shutil
 import sys
diff --git a/src/MCPClient/lib/clientScripts/create_transfer_mets.py b/src/MCPClient/lib/clientScripts/create_transfer_mets.py
index 9574da9202..cc76636148 100755
--- a/src/MCPClient/lib/clientScripts/create_transfer_mets.py
+++ b/src/MCPClient/lib/clientScripts/create_transfer_mets.py
@@ -16,8 +16,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.    If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
 import argparse
 import logging
 import os
diff --git a/src/MCPClient/lib/clientScripts/determine_aip_version_key_exit_code.py b/src/MCPClient/lib/clientScripts/determine_aip_version_key_exit_code.py
index 594b3f45df..c53d25e39c 100755
--- a/src/MCPClient/lib/clientScripts/determine_aip_version_key_exit_code.py
+++ b/src/MCPClient/lib/clientScripts/determine_aip_version_key_exit_code.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 
diff --git a/src/MCPClient/lib/clientScripts/extract_maildir_attachments.py b/src/MCPClient/lib/clientScripts/extract_maildir_attachments.py
index 0c7bedce69..13d31f8389 100755
--- a/src/MCPClient/lib/clientScripts/extract_maildir_attachments.py
+++ b/src/MCPClient/lib/clientScripts/extract_maildir_attachments.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import mailbox
 import os
 import sys
diff --git a/src/MCPClient/lib/clientScripts/extract_zipped_transfer.py b/src/MCPClient/lib/clientScripts/extract_zipped_transfer.py
index 1a7d7b4dc2..9d968036e6 100755
--- a/src/MCPClient/lib/clientScripts/extract_zipped_transfer.py
+++ b/src/MCPClient/lib/clientScripts/extract_zipped_transfer.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import argparse
 import os
 import shutil
diff --git a/src/MCPClient/lib/clientScripts/fits.py b/src/MCPClient/lib/clientScripts/fits.py
index 9271a0b237..fcf9f18844 100755
--- a/src/MCPClient/lib/clientScripts/fits.py
+++ b/src/MCPClient/lib/clientScripts/fits.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import tempfile
 
diff --git a/src/MCPClient/lib/clientScripts/identify_dspace_files.py b/src/MCPClient/lib/clientScripts/identify_dspace_files.py
index 1c07ba3d95..17e18dda28 100755
--- a/src/MCPClient/lib/clientScripts/identify_dspace_files.py
+++ b/src/MCPClient/lib/clientScripts/identify_dspace_files.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 
 import django
diff --git a/src/MCPClient/lib/clientScripts/identify_dspace_mets_files.py b/src/MCPClient/lib/clientScripts/identify_dspace_mets_files.py
index 923cdcd884..f2f2a6a496 100755
--- a/src/MCPClient/lib/clientScripts/identify_dspace_mets_files.py
+++ b/src/MCPClient/lib/clientScripts/identify_dspace_mets_files.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import django
 
 django.setup()
diff --git a/src/MCPClient/lib/clientScripts/is_maildir_aip.py b/src/MCPClient/lib/clientScripts/is_maildir_aip.py
index 2e091059a8..da1232e35f 100755
--- a/src/MCPClient/lib/clientScripts/is_maildir_aip.py
+++ b/src/MCPClient/lib/clientScripts/is_maildir_aip.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import mailbox
 import os
 
diff --git a/src/MCPClient/lib/clientScripts/load_labels_from_csv.py b/src/MCPClient/lib/clientScripts/load_labels_from_csv.py
index 34df80eb95..6284eb299e 100755
--- a/src/MCPClient/lib/clientScripts/load_labels_from_csv.py
+++ b/src/MCPClient/lib/clientScripts/load_labels_from_csv.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import csv
 import os
 
diff --git a/src/MCPClient/lib/clientScripts/manual_normalization_check_for_manual_normalization_directory.py b/src/MCPClient/lib/clientScripts/manual_normalization_check_for_manual_normalization_directory.py
index 304db727c7..acb5ac730f 100755
--- a/src/MCPClient/lib/clientScripts/manual_normalization_check_for_manual_normalization_directory.py
+++ b/src/MCPClient/lib/clientScripts/manual_normalization_check_for_manual_normalization_directory.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 
 
diff --git a/src/MCPClient/lib/clientScripts/manual_normalization_identify_files_included.py b/src/MCPClient/lib/clientScripts/manual_normalization_identify_files_included.py
index d89c389bec..2e75037372 100755
--- a/src/MCPClient/lib/clientScripts/manual_normalization_identify_files_included.py
+++ b/src/MCPClient/lib/clientScripts/manual_normalization_identify_files_included.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 # fileOperations requires Django to be set up
 import django
 from django.db import transaction
diff --git a/src/MCPClient/lib/clientScripts/manual_normalization_move_access_files_to_dip.py b/src/MCPClient/lib/clientScripts/manual_normalization_move_access_files_to_dip.py
index 750991ee05..059e00be29 100755
--- a/src/MCPClient/lib/clientScripts/manual_normalization_move_access_files_to_dip.py
+++ b/src/MCPClient/lib/clientScripts/manual_normalization_move_access_files_to_dip.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 
 import django
diff --git a/src/MCPClient/lib/clientScripts/manual_normalization_remove_mn_directories.py b/src/MCPClient/lib/clientScripts/manual_normalization_remove_mn_directories.py
index 08ca391b7e..e8643ede44 100755
--- a/src/MCPClient/lib/clientScripts/manual_normalization_remove_mn_directories.py
+++ b/src/MCPClient/lib/clientScripts/manual_normalization_remove_mn_directories.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 
diff --git a/src/MCPClient/lib/clientScripts/move_sip.py b/src/MCPClient/lib/clientScripts/move_sip.py
index 827d76c599..2d123311dc 100755
--- a/src/MCPClient/lib/clientScripts/move_sip.py
+++ b/src/MCPClient/lib/clientScripts/move_sip.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import shutil
 import sys
diff --git a/src/MCPClient/lib/clientScripts/move_transfer.py b/src/MCPClient/lib/clientScripts/move_transfer.py
index 70ac4d4dc0..89eca78c16 100755
--- a/src/MCPClient/lib/clientScripts/move_transfer.py
+++ b/src/MCPClient/lib/clientScripts/move_transfer.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 
 import django
diff --git a/src/MCPClient/lib/clientScripts/remove_directories.py b/src/MCPClient/lib/clientScripts/remove_directories.py
index d3a88dbdcc..c5df1e58d7 100755
--- a/src/MCPClient/lib/clientScripts/remove_directories.py
+++ b/src/MCPClient/lib/clientScripts/remove_directories.py
@@ -15,8 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
 import os
 import shutil
 
diff --git a/src/MCPClient/lib/clientScripts/remove_files_without_premis_metadata.py b/src/MCPClient/lib/clientScripts/remove_files_without_premis_metadata.py
index 2af792d302..9e782e6d1b 100755
--- a/src/MCPClient/lib/clientScripts/remove_files_without_premis_metadata.py
+++ b/src/MCPClient/lib/clientScripts/remove_files_without_premis_metadata.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import argparse
 import os
 
diff --git a/src/MCPClient/lib/clientScripts/remove_hidden_files_and_directories.py b/src/MCPClient/lib/clientScripts/remove_hidden_files_and_directories.py
index 3747881618..1f4123f342 100755
--- a/src/MCPClient/lib/clientScripts/remove_hidden_files_and_directories.py
+++ b/src/MCPClient/lib/clientScripts/remove_hidden_files_and_directories.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import shutil
 import sys
diff --git a/src/MCPClient/lib/clientScripts/restructure_bag_aip_to_sip.py b/src/MCPClient/lib/clientScripts/restructure_bag_aip_to_sip.py
index aecdb86531..ad93a196f1 100755
--- a/src/MCPClient/lib/clientScripts/restructure_bag_aip_to_sip.py
+++ b/src/MCPClient/lib/clientScripts/restructure_bag_aip_to_sip.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import shutil
 
diff --git a/src/MCPClient/lib/clientScripts/restructure_dip_for_content_dm_upload.py b/src/MCPClient/lib/clientScripts/restructure_dip_for_content_dm_upload.py
index f6561f6360..838ac8b122 100755
--- a/src/MCPClient/lib/clientScripts/restructure_dip_for_content_dm_upload.py
+++ b/src/MCPClient/lib/clientScripts/restructure_dip_for_content_dm_upload.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Mark Jordan <mark2jordan@gmail.com>
 import argparse
 import collections
 import csv
diff --git a/src/MCPClient/lib/clientScripts/restructure_for_compliance.py b/src/MCPClient/lib/clientScripts/restructure_for_compliance.py
index bf3fc8769d..f4a475226c 100755
--- a/src/MCPClient/lib/clientScripts/restructure_for_compliance.py
+++ b/src/MCPClient/lib/clientScripts/restructure_for_compliance.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import re
 import shutil
diff --git a/src/MCPClient/lib/clientScripts/restructure_for_compliance_maildir.py b/src/MCPClient/lib/clientScripts/restructure_for_compliance_maildir.py
index fb03d8c1a1..cf35d22241 100755
--- a/src/MCPClient/lib/clientScripts/restructure_for_compliance_maildir.py
+++ b/src/MCPClient/lib/clientScripts/restructure_for_compliance_maildir.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import shutil
 
diff --git a/src/MCPClient/lib/clientScripts/retry_normalize_remove_normalized.py b/src/MCPClient/lib/clientScripts/retry_normalize_remove_normalized.py
index 09bf351da8..752cae2d67 100755
--- a/src/MCPClient/lib/clientScripts/retry_normalize_remove_normalized.py
+++ b/src/MCPClient/lib/clientScripts/retry_normalize_remove_normalized.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import shutil
 import sys
diff --git a/src/MCPClient/lib/clientScripts/rights_from_csv.py b/src/MCPClient/lib/clientScripts/rights_from_csv.py
index 85a9468300..074f17ce80 100755
--- a/src/MCPClient/lib/clientScripts/rights_from_csv.py
+++ b/src/MCPClient/lib/clientScripts/rights_from_csv.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Mike Cantelon <mike@artefactual.com>
 import csv
 import os
 
diff --git a/src/MCPClient/lib/clientScripts/set_maildir_file_grp_use_and_file_ids.py b/src/MCPClient/lib/clientScripts/set_maildir_file_grp_use_and_file_ids.py
index d0121f8597..40edb45819 100755
--- a/src/MCPClient/lib/clientScripts/set_maildir_file_grp_use_and_file_ids.py
+++ b/src/MCPClient/lib/clientScripts/set_maildir_file_grp_use_and_file_ids.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 
 import django
diff --git a/src/MCPClient/lib/clientScripts/set_transfer_type.py b/src/MCPClient/lib/clientScripts/set_transfer_type.py
index 8c5a4e8886..b011e73a99 100755
--- a/src/MCPClient/lib/clientScripts/set_transfer_type.py
+++ b/src/MCPClient/lib/clientScripts/set_transfer_type.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import django
 
 django.setup()
diff --git a/src/MCPClient/lib/clientScripts/store_aip.py b/src/MCPClient/lib/clientScripts/store_aip.py
index 4ed2a80c8b..ad8dee9863 100755
--- a/src/MCPClient/lib/clientScripts/store_aip.py
+++ b/src/MCPClient/lib/clientScripts/store_aip.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import argparse
 import os
 import shutil
diff --git a/src/MCPClient/lib/clientScripts/transcoder.py b/src/MCPClient/lib/clientScripts/transcoder.py
index 3ed67a184d..487ad06865 100755
--- a/src/MCPClient/lib/clientScripts/transcoder.py
+++ b/src/MCPClient/lib/clientScripts/transcoder.py
@@ -15,8 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClient
 # archivematicaCommon
 from django.db.models import F
 from executeOrRunSubProcess import executeOrRun
diff --git a/src/MCPClient/lib/clientScripts/trim_create_rights_entries.py b/src/MCPClient/lib/clientScripts/trim_create_rights_entries.py
index 365120a713..8dcb8dba62 100755
--- a/src/MCPClient/lib/clientScripts/trim_create_rights_entries.py
+++ b/src/MCPClient/lib/clientScripts/trim_create_rights_entries.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import string
 import sys
diff --git a/src/MCPClient/lib/clientScripts/trim_restructure_for_compliance.py b/src/MCPClient/lib/clientScripts/trim_restructure_for_compliance.py
index 2518a76e91..ba4628772a 100755
--- a/src/MCPClient/lib/clientScripts/trim_restructure_for_compliance.py
+++ b/src/MCPClient/lib/clientScripts/trim_restructure_for_compliance.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 
 import django
diff --git a/src/MCPClient/lib/clientScripts/trim_verify_checksums.py b/src/MCPClient/lib/clientScripts/trim_verify_checksums.py
index 05bf10806c..a642a01bb0 100755
--- a/src/MCPClient/lib/clientScripts/trim_verify_checksums.py
+++ b/src/MCPClient/lib/clientScripts/trim_verify_checksums.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 import uuid
diff --git a/src/MCPClient/lib/clientScripts/trim_verify_manifest.py b/src/MCPClient/lib/clientScripts/trim_verify_manifest.py
index 582220d4ac..9cb45b01b2 100755
--- a/src/MCPClient/lib/clientScripts/trim_verify_manifest.py
+++ b/src/MCPClient/lib/clientScripts/trim_verify_manifest.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import re
 import sys
diff --git a/src/MCPClient/lib/clientScripts/verify_and_restructure_transfer_bag.py b/src/MCPClient/lib/clientScripts/verify_and_restructure_transfer_bag.py
index 203b7b6879..f6c2e071ad 100755
--- a/src/MCPClient/lib/clientScripts/verify_and_restructure_transfer_bag.py
+++ b/src/MCPClient/lib/clientScripts/verify_and_restructure_transfer_bag.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 
diff --git a/src/MCPClient/lib/clientScripts/verify_checksums_in_file_sec_of_dspace_mets_files.py b/src/MCPClient/lib/clientScripts/verify_checksums_in_file_sec_of_dspace_mets_files.py
index 02476fd7d2..fdca386cd8 100755
--- a/src/MCPClient/lib/clientScripts/verify_checksums_in_file_sec_of_dspace_mets_files.py
+++ b/src/MCPClient/lib/clientScripts/verify_checksums_in_file_sec_of_dspace_mets_files.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import hashlib
 import os
 import sys
diff --git a/src/MCPClient/lib/clientScripts/verify_sip_compliance.py b/src/MCPClient/lib/clientScripts/verify_sip_compliance.py
index cc6fa69aaa..c54aaac10c 100755
--- a/src/MCPClient/lib/clientScripts/verify_sip_compliance.py
+++ b/src/MCPClient/lib/clientScripts/verify_sip_compliance.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 
diff --git a/src/MCPClient/lib/clientScripts/verify_transfer_compliance.py b/src/MCPClient/lib/clientScripts/verify_transfer_compliance.py
index 60e9adb206..137aa6513c 100755
--- a/src/MCPClient/lib/clientScripts/verify_transfer_compliance.py
+++ b/src/MCPClient/lib/clientScripts/verify_transfer_compliance.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaClientScript
-# @author Joseph Perry <joseph@artefactual.com>
 import os
 import sys
 
diff --git a/src/archivematicaCommon/lib/archivematicaFunctions.py b/src/archivematicaCommon/lib/archivematicaFunctions.py
index be41e27735..bdf6fadf86 100644
--- a/src/archivematicaCommon/lib/archivematicaFunctions.py
+++ b/src/archivematicaCommon/lib/archivematicaFunctions.py
@@ -14,9 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaCommon
-# @author Joseph Perry <joseph@artefactual.com>
 """archivematicaFunctions provides various helper functions across the
 different Archivematica modules.
 """
diff --git a/src/archivematicaCommon/lib/countryCodes.py b/src/archivematicaCommon/lib/countryCodes.py
index 606c08e173..8c2223fcad 100644
--- a/src/archivematicaCommon/lib/countryCodes.py
+++ b/src/archivematicaCommon/lib/countryCodes.py
@@ -14,9 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaCommon
-# @author Joseph Perry <joseph@artefactual.com>
 # http://www.iso.org/iso/country_codes.htm
 # Country Codes - ISO 3166
 # Country Name;ISO 3166-1-alpha-2 code
diff --git a/src/archivematicaCommon/lib/databaseFunctions.py b/src/archivematicaCommon/lib/databaseFunctions.py
index 0fe9866544..d5a96e3455 100644
--- a/src/archivematicaCommon/lib/databaseFunctions.py
+++ b/src/archivematicaCommon/lib/databaseFunctions.py
@@ -14,9 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaCommon
-# @author Joseph Perry <joseph@artefactual.com>
 import logging
 import random
 import string
diff --git a/src/archivematicaCommon/lib/dicts.py b/src/archivematicaCommon/lib/dicts.py
index b1bbe063e8..b800f265e9 100644
--- a/src/archivematicaCommon/lib/dicts.py
+++ b/src/archivematicaCommon/lib/dicts.py
@@ -14,9 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage MCPServer
-# @author Joseph Perry <joseph@artefactual.com>
 import ast
 import os
 import re
diff --git a/src/archivematicaCommon/lib/elasticSearchFunctions.py b/src/archivematicaCommon/lib/elasticSearchFunctions.py
index 49d33da7d8..2428d1fe7a 100644
--- a/src/archivematicaCommon/lib/elasticSearchFunctions.py
+++ b/src/archivematicaCommon/lib/elasticSearchFunctions.py
@@ -14,9 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaCommon
-# @author Mike Cantelon <mike@artefactual.com>
 import calendar
 import copy
 import datetime
diff --git a/src/archivematicaCommon/lib/executeOrRunSubProcess.py b/src/archivematicaCommon/lib/executeOrRunSubProcess.py
index 7acb561688..8d149b674f 100644
--- a/src/archivematicaCommon/lib/executeOrRunSubProcess.py
+++ b/src/archivematicaCommon/lib/executeOrRunSubProcess.py
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaCommon
-# @author Joseph Perry <joseph@artefactual.com>
 import io
 import os
 import shlex
diff --git a/src/archivematicaCommon/lib/fileOperations.py b/src/archivematicaCommon/lib/fileOperations.py
index 96566233a1..b23f134d46 100644
--- a/src/archivematicaCommon/lib/fileOperations.py
+++ b/src/archivematicaCommon/lib/fileOperations.py
@@ -14,9 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage archivematicaCommon
-# @author Joseph Perry <joseph@artefactual.com>
 import csv
 import os
 import shutil
diff --git a/src/dashboard/src/components/ingest/views_NormalizationReport.py b/src/dashboard/src/components/ingest/views_NormalizationReport.py
index 32363296ca..feb50ae54d 100755
--- a/src/dashboard/src/components/ingest/views_NormalizationReport.py
+++ b/src/dashboard/src/components/ingest/views_NormalizationReport.py
@@ -16,10 +16,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.    If not, see <http://www.gnu.org/licenses/>.
-# @package Archivematica
-# @subpackage Dashboard
-# @author Joseph Perry <joseph@artefactual.com>
-# @author Justin Simpson <jsimpson@artefactual.com>
 from components import helpers
 from django.db import connection
 
diff --git a/src/dashboard/src/fpr/south_migrations/recreateData.sh b/src/dashboard/src/fpr/south_migrations/recreateData.sh
index d87776f746..5f76356c60 100755
--- a/src/dashboard/src/fpr/south_migrations/recreateData.sh
+++ b/src/dashboard/src/fpr/south_migrations/recreateData.sh
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
 
-# @package Archivematica
-# @author Joseph Perry <joseph@artefactual.com>
 
 database="$FPR_DB_NAME"
 origDir="`pwd`"