diff --git a/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js
index 1dab63b9..5fd9238d 100644
--- a/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js
+++ b/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js
@@ -59,7 +59,7 @@ app.controller('EmailMessageController', function($scope, $timeout,$translate,
                                 showCloseButton: true,
                             });
 
-							$scope.getEmailMessages();
+							$scope.$emit('handleEmitEmailMessageTableChanged');
 						} else {
 							var templateName = "FDD.EMAIL_MESSAGE";
                             templateName = $translate.instant(templateName);
@@ -85,7 +85,4 @@ app.controller('EmailMessageController', function($scope, $timeout,$translate,
 			});
 	};
 
-	// $scope.getEmailMessages();
-
-	
 });
\ No newline at end of file
diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
index 4e9b52d9..89310d91 100644
--- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
+++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
@@ -38,22 +38,11 @@ app.controller('EmailMessageOptionController', function($scope, $timeout,
 			period:$scope.currentPeriod
 		});
 		
-		if(true){
-			EmailMessageAnalysisService.getAnalysisResult(query, function(error, data) {
-				if (!error) {
-					$scope.$emit('handleEmitEmailMessageOptionChanged', data);
-				}
-			});
-		}else{
-			EmailMessageAnalysisService.getTestDataResult(query, function(error, data) {
-				if (!error) {
-					$timeout(function(){
-						$scope.$emit('handleEmitEmailMessageOptionChanged', data);
-					},1000);
-
-				}
-			});
-		}
+		EmailMessageAnalysisService.getAnalysisResult(query, function(error, data) {
+			if (!error) {
+				$scope.$emit('handleEmitEmailMessageOptionChanged', data);
+			}
+		});
 		
 	};
 	$timeout(function() {
diff --git a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js
index 6d9a7342..94196b62 100644
--- a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js
+++ b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js
@@ -38,22 +38,11 @@ app.controller('TextMessageOptionController', function($scope, $timeout,
 			period:$scope.currentPeriod
 		});
 		
-		if(true){
-			TextMessageAnalysisService.getAnalysisResult(query, function(error, data) {
-				if (!error) {
-					$scope.$emit('handleEmitTextMessageOptionChanged', data);
-				}
-			});
-		}else{
-			TextMessageAnalysisService.getTestDataResult(query, function(error, data) {
-				if (!error) {
-					$timeout(function(){
-						$scope.$emit('handleEmitTextMessageOptionChanged', data);
-					},1000);
-
-				}
-			});
-		}
+		TextMessageAnalysisService.getAnalysisResult(query, function(error, data) {
+			if (!error) {
+				$scope.$emit('handleEmitTextMessageOptionChanged', data);
+			}
+		});
 		
 	};
 	$timeout(function() {