diff --git a/controllers/grid/files/productionReady/ProductionReadyFilesGridHandler.inc.php b/controllers/grid/files/productionReady/ProductionReadyFilesGridHandler.inc.php
deleted file mode 100644
index 7ace60bdba2..00000000000
--- a/controllers/grid/files/productionReady/ProductionReadyFilesGridHandler.inc.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * @file controllers/grid/files/productionready/ProductionReadyFilesGridHandler.inc.php
- *
- * Copyright (c) 2003-2013 John Willinsky
- * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
- *
- * @class ProductionReadyFilesGridHandler
- * @ingroup controllers_grid_files_productionready
- *
- * @brief Handle the fair copy files grid (displays copyedited files ready to move to proofreading)
- */
-
-import('lib.pkp.controllers.grid.files.SubmissionFilesGridHandler');
-import('lib.pkp.controllers.grid.files.UploaderUserGroupGridColumn');
-
-class ProductionReadyFilesGridHandler extends SubmissionFilesGridHandler {
-	/**
-	 * Constructor
-	 */
-	function ProductionReadyFilesGridHandler() {
-		import('lib.pkp.controllers.grid.files.SubmissionFilesGridDataProvider');
-		parent::SubmissionFilesGridHandler(
-			new SubmissionFilesGridDataProvider(SUBMISSION_FILE_PRODUCTION_READY),
-			WORKFLOW_STAGE_ID_PRODUCTION,
-			FILE_GRID_ADD|FILE_GRID_DELETE|FILE_GRID_VIEW_NOTES
-		);
-
-		$this->addRoleAssignment(
-			array(
-				ROLE_ID_SUB_EDITOR,
-				ROLE_ID_MANAGER,
-				ROLE_ID_ASSISTANT
-			),
-			array(
-				'fetchGrid', 'fetchRow',
-				'addFile',
-				'downloadFile',
-				'deleteFile',
-				'signOffFile'
-			)
-		);
-	}
-
-	/**
-	 * @see PKPHandler::initialize()
-	 */
-	function initialize($request) {
-		parent::initialize($request);
-
-		$this->setTitle('editor.monograph.production.productionReadyFiles');
-		$this->setInstructions('editor.monograph.production.productionReadyFilesDescription');
-
-		$currentUser = $request->getUser();
-
-		// Get all the uploader user group id's
-		$uploaderUserGroupIds = array();
-		$dataElements = $this->getGridDataElements($request);
-		foreach ($dataElements as $id => $rowElement) {
-			$submissionFile = $rowElement['submissionFile'];
-			$uploaderUserGroupIds[] = $submissionFile->getUserGroupId();
-		}
-		// Make sure each is only present once
-		$uploaderUserGroupIds = array_unique($uploaderUserGroupIds);
-
-		// Add a Uploader UserGroup column for each group
-		$userGroupDao = DAORegistry::getDAO('UserGroupDAO');
-		foreach ($uploaderUserGroupIds as $userGroupId) {
-			$userGroup = $userGroupDao->getById($userGroupId);
-			assert(is_a($userGroup, 'UserGroup'));
-			$this->addColumn(new UploaderUserGroupGridColumn($userGroup));
-		}
-	}
-}
-
-?>
diff --git a/lib/pkp b/lib/pkp
index 44d24508bc4..57a4a99a9d0 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 44d24508bc491488f25f315a111cb88930da326a
+Subproject commit 57a4a99a9d07ba539523ef1c679070ba74c76d0e
diff --git a/locale/en_US/editor.xml b/locale/en_US/editor.xml
index a5e4dd6d74e..72b263dc0b2 100644
--- a/locale/en_US/editor.xml
+++ b/locale/en_US/editor.xml
@@ -73,8 +73,7 @@
 
 	<!-- Production/Proof related -->
 	<message key="editor.submission.production.introduction"><![CDATA[In Production, the editor selects book formats (e.g., digital, paperback, etc.) in <span class="pkp_help_title">Publication Formats</span>, for which the layout editor prepares publication-quality files based on the production ready files. The publication-quality files are uploaded for each format in <span class="pkp_help_title">Page Proofs</span>, where they are proof read. The book is made <em>Available</em> (i.e., published) for each format in <span class="pkp_help_title">Publication Formats</span>, after the <em>Proofs</em> is checked as approved, and the Catalog entry is checked as included in the book’s catalog entry.]]></message>
-	<message key="editor.monograph.production.productionReadyFiles">Production Ready Files</message>
-	<message key="editor.monograph.production.productionReadyFilesDescription"><![CDATA[The layout editor prepares these files for each publication format and then uploads to the appropriate <span class="pkp_help_title">Page Proofs</span> for proofreading.]]></message>
+	<message key="editor.submission.production.productionReadyFilesDescription"><![CDATA[The layout editor prepares these files for each publication format and then uploads to the appropriate <span class="pkp_help_title">Page Proofs</span> for proofreading.]]></message>
 	<message key="editor.monograph.proofs">Proofs</message>
 	<message key="editor.monograph.production.approvalAndPublishing">Approval and Publishing</message>
 	<message key="editor.monograph.production.approvalAndPublishingDescription">Different publication formats, such as hardcover, softcover and digital, can be uploaded in the Publication Formats section below. You can use the publication formats grid below as a checklist for what still needs to be done to publish a publication format.</message>
diff --git a/locale/fr_CA/editor.xml b/locale/fr_CA/editor.xml
index a6765ac93a1..ce40adcaa2a 100644
--- a/locale/fr_CA/editor.xml
+++ b/locale/fr_CA/editor.xml
@@ -88,8 +88,7 @@
 	<message key="editor.submission.production.introduction"><![CDATA[À l'étape de publication, le rédacteur en chef choisit le format du livre (ex.: numérique, couverture souple, etc.) dans 
  <span class="pkp_help_title">Formats de publication</span>. Le rédacteur metteur en page préparera ensuite des fichiers publiables à partir des fichiers destinés à la publication. Les fichiers publiables sont téléchargés pour chaque format dans <span class="pkp_help_title">Épreuves</span>, où ils seront révisés. Le livre est <em>Disponible</em> (c'est-à-dire publié) pour chacun des formats dans <span class="pkp_help_title">Formats de publication</span>, lorsque les <em>Épreuves</em> ont été vérifiées et approuvées, et on indique que l'entrée de catalogue a été ajoutée à l'entrée de catalogue du livre.]]></message>
 	
-	<message key="editor.monograph.production.productionReadyFiles">Fichiers publiables</message>
-	<message key="editor.monograph.production.productionReadyFilesDescription"><![CDATA[Le rédacteur metteur en page prépare ces fichiers pour chaque format de publication, puis il télécharge les  <span class="pkp_help_title">Épreuves</span> appropriées pour révision.]]></message>
+	<message key="editor.submission.production.productionReadyFilesDescription"><![CDATA[Le rédacteur metteur en page prépare ces fichiers pour chaque format de publication, puis il télécharge les  <span class="pkp_help_title">Épreuves</span> appropriées pour révision.]]></message>
 	
 	<message key="editor.monograph.proofs">Épreuves</message>
 	<message key="editor.monograph.production.approvalAndPublishing">Approbation et publication</message>