diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index ff7d6dfb1f..e3ffacabc9 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -187,16 +187,10 @@ class Crypt {
          * @return true / false
          */
 	public static function isLegacyEncryptedContent( $data, $relPath ) {
-		
-// 		trigger_error("REL PATH = ".var_export($relPath, 1));
-		
-// 		trigger_error( "DATA = ".var_export($data, 1). "   CATFILE?: ".var_export( self::isCatfile( $data ), 1));
 	
 		// Fetch all file metadata from DB
 		$metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );
 		
-		trigger_error("PATH = ". var_export($relPath, 1)."   METADATA = ".var_export($metadata['encrypted'], 1));
-		
 		// If a file is flagged with encryption in DB, but isn't a 
 		// valid content + IV combination, it's probably using the 
 		// legacy encryption system
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a16bf94160..355ffb90ef 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -269,8 +269,6 @@ class Util {
 						
 						$data = $this->view->file_get_contents( $filePath );
 						
-// 						trigger_error("HAKE \n".var_export($this->view->file_get_contents( $filePath ), 1)." \nfilepath = ".var_export($filePath, 1 ));
-						
 						// If the file is encrypted
 						// NOTE: If the userId is 
 						// empty or not set, file will 
@@ -366,8 +364,6 @@ class Util {
 	
 		if ( $found = $this->findFiles( $dirPath ) ) {
 		
-// 		trigger_error("FOUND = ".print_r($found, 1));
-		
 			// Disable proxy to prevent file being encrypted twice
 			\OC_FileProxy::$enabled = false;
 		
@@ -407,8 +403,6 @@ class Util {
 					// Fetch data from file
 					$legacyData = $this->view->file_get_contents( $legacyFile['path'] );
 				
-					trigger_error("\n\nlegdata = ".var_export($legacyData, 1).' \n\npassphrase = '.var_export($legacyPassphrase, 1).' \n\npublickey = '.var_export($publicKey, 1).' \n\nnewpass = '.var_export($newPassphrase, 1));
-				
 					// Recrypt data, generate catfile
 					$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase );