diff --git a/generic_data/migration/migrationTest.php b/generic_data/migration/migrationTest.php
index be333c2..5f7326c 100644
--- a/generic_data/migration/migrationTest.php
+++ b/generic_data/migration/migrationTest.php
@@ -4,7 +4,7 @@
 		define("USERPATH", "/home/budnik/data/");
 		
 		require_once AMDA_IHM."php/classes/UserWsTransfer.php";
-		$user = 'budnik';
+		$user = 'genot';
 		
 		if (!is_dir(USERPATH)) mkdir(USERPATH);
 		if (!is_dir(USERPATH.$user)) mkdir(USERPATH.$user); 
@@ -17,24 +17,24 @@
 		 
 		$res = $convert->checkWS();
 		if (!$res['success']) exit($res['error']);
-/*
+
 		$res = $convert->transferMyData(); 
 		$msg = $res['msg'];
 	 
 		$res = $convert->transferDerived();
-		$msg .= $res['msg'];*/
+		$msg .= $res['msg'];
+
+		$res = $convert->transferTimeTables();
+		$msg .= $res['msg'];
 
-// 		$res = $convert->transferTimeTables();
-// 		$msg .= $res['msg'];
-// 
 		$res = $convert->transferConditions();
 		$msg .= $res['msg'];
 
 // 		$res = $convert->transferRequests();
 // 		$msg .= $res['msg'];
  
-// 		$res = $convert->transferFilters();
-// 		$msg .= $res['msg'];
+		$res = $convert->transferFilters();
+		$msg .= $res['msg'];
 
 
 		echo $msg.PHP_EOL;     
diff --git a/php/classes/UserWsTransfer.php b/php/classes/UserWsTransfer.php
index 5c8bc97..039309e 100644
--- a/php/classes/UserWsTransfer.php
+++ b/php/classes/UserWsTransfer.php
@@ -313,18 +313,21 @@ class UserWsTransfer {
 				foreach ($wsParams as $wsParam) {
 					$res = $xp->query("//param[@name='".trim($wsParam)."']");
 					if ($res->length == 0) {
-						unlink($this->newWsDir.$id.'.xml');
-						$paramsToRemove[] = $param; 
-						$this->ws_deleted[] = $name;
-						$msg .= '<li><i>'.$name.'</i> : uses obsolete / not ready ws param : <br/> '.$expression.'<br/>';
+						if (file_exists($this->newWsDir.$id.'.xml')) { // Delete only once
+							unlink($this->newWsDir.$id.'.xml');
+							$paramsToRemove[] = $param; 
+							$this->ws_deleted[] = $name;
+							$msg .= '<li><i>'.$name.'</i> : uses obsolete / not ready ws param : <br/> '.$expression.'<br/>';
+						}
 					}
 				}
 			}
 		}
 		
-		foreach ($paramsToRemove as $paramToRemove) {
-			$paramToRemove->parentNode->removeChild($paramToRemove);
-		}
+		if (count($paramsToRemove) > 0)
+			foreach ($paramsToRemove as $paramToRemove) {
+				$paramToRemove->parentNode->removeChild($paramToRemove);
+			}
 		
 		$this->newWs->save($this->newWsDir.'WsParams.xml');
 		$copied = $newParams->length - count($paramsToRemove);
@@ -560,20 +563,23 @@ class UserWsTransfer {
 				copy(OLDUSERPATH.TRANSFERUSER.'/DATA/'.$fileName,NEWUSERPATH.TRANSFERUSER.'/DATA/'.$fileName);
 			}
 		}
-		 
-		foreach ($deletedVi as $vi) {
-			$node = $FilesXml->getElementById($vi);
-			if ($node)
-				$node->parentNode->removeChild($node);
-		}
-      $msg .= 'Not copied files :<br/>';
-		foreach ($deletedFiles as $vi) {
-			$node = $FilesXml->getElementById($vi);
-			if ($node) {
-				$msg .= '<li><i>'.$vi.'</i> <br/>';
-				$node->parentNode->removeChild($node);
+		
+		if (count($deletedFiles) > 0) 
+			foreach ($deletedVi as $vi) {
+				$node = $FilesXml->getElementById($vi);
+				if ($node)
+					$node->parentNode->removeChild($node);
+			}
+		$msg .= 'Not copied files :<br/>';
+      
+		if (count($deletedFiles) > 0)
+			foreach ($deletedFiles as $vi) {
+				$node = $FilesXml->getElementById($vi);
+				if ($node) {
+					$msg .= '<li><i>'.$vi.'</i> <br/>';
+					$node->parentNode->removeChild($node);
+				}
 			}
-		}
 
 		$FilesXml->save($this->newWsDir.'Files.xml');
 
--
libgit2 0.21.2