diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
index a22339d6..7886bcc1 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
@@ -21,16 +21,6 @@
 */
 package com.iemr.common.identity.data.rmnch;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import com.google.gson.annotations.Expose;
-
 public class BenHealthIDDetails {
 
 	Integer benHealthID;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
index 510d1d2e..30cb0776 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
@@ -30,8 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
index 4323b895..f2b9d2dc 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
@@ -30,8 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
index aea73035..400b7f40 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
@@ -30,8 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
@@ -107,7 +105,6 @@ public class MBeneficiaryservicemapping implements Serializable {
 	@Column(length = 45)
 	private String stateName;
 
-	
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
index 647bfda4..8bdc2d22 100644
--- a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
+++ b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
@@ -30,8 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -46,8 +44,7 @@
 @Table(name = "t_bendataaccess")
 @NamedQuery(name = "TBendataaccess.findAll", query = "SELECT t FROM TBendataaccess t")
 @Data
-public class TBendataaccess implements Serializable
-{
+public class TBendataaccess implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
index be760105..ccbd753e 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
@@ -28,7 +28,6 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.iemr.common.identity.data.rmnch.RMNCHMBeneficiaryaddress;
 import com.iemr.common.identity.data.rmnch.RMNCHMBeneficiaryconsent;
 
 @Repository
diff --git a/src/main/java/com/iemr/common/identity/security/Encryption.java b/src/main/java/com/iemr/common/identity/security/Encryption.java
deleted file mode 100644
index 04286702..00000000
--- a/src/main/java/com/iemr/common/identity/security/Encryption.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.security;
-
-public class Encryption {
-
-}
diff --git a/src/main/java/com/iemr/common/identity/security/Hash.java b/src/main/java/com/iemr/common/identity/security/Hash.java
deleted file mode 100644
index 041b55e9..00000000
--- a/src/main/java/com/iemr/common/identity/security/Hash.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.security;
-
-public class Hash {
-
-}
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index bc7063e9..ddeffe17 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -125,8 +125,6 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 
 		try {
 			if (requestOBJ != null && !requestOBJ.isEmpty()) {
-				// JSONObject jsonOBJ = new JSONObject(requestOBJ);
-
 				JsonObject jsnOBJ = new JsonObject();
 				JsonParser jsnParser = new JsonParser();
 				JsonElement jsnElmnt = jsnParser.parse(requestOBJ);
@@ -147,15 +145,11 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 
 						if (benRegID != null) {
 							for (RMNCHBeneficiaryDetailsRmnch obj : benDetailsExtraList) {
-//						RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
-//								.getByIdAndVanID(obj.getId(), obj.getVanID());
 								obj.setBenRegId(benRegID);
 								RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
 										.getByRegID(benRegID);
 								if (temp != null) {
 									obj.setBeneficiaryDetails_RmnchId(temp.getBeneficiaryDetails_RmnchId());
-//									obj.setModifiedBy(obj.getCreatedBy());
-//									obj.setLastModDate(new Timestamp(System.currentTimeMillis()));
 								}
 
 								if (obj.getRelatedBeneficiaryIds() != null
@@ -334,33 +328,6 @@ public String getBenDataByAsha(String requestOBJ, String authorisation) throws E
 			} else
 				throw new Exception("Invalid/missing village details");
 
-			// ------
-//			if (request != null && request.getVillageID() != null) {
-//				List<RMNCHMBeneficiaryaddress> resultSet;
-//				Integer pageSize = Integer.valueOf(door_to_door_page_size);
-//				if (request.getPageNo() != null) {
-//					PageRequest pr = new PageRequest(request.getPageNo(), pageSize);
-//					if (request.getFromDate() != null && request.getToDate() != null) {
-//						Page<RMNCHMBeneficiaryaddress> p = rMNCHBenAddressRepo.getBenDataFilteredWithDateRange(
-//								request.getVillageID(), request.getFromDate(), request.getToDate(), pr);
-//						resultSet = p.getContent();
-//						totalPage = p.getTotalPages();
-//					} else {
-//						Page<RMNCHMBeneficiaryaddress> p = rMNCHBenAddressRepo.getBenData(request.getVillageID(), pr);
-//						resultSet = p.getContent();
-//						totalPage = p.getTotalPages();
-//					}
-//					if (resultSet != null && resultSet.size() > 0) {
-//						outputResponse = getMappingsForAddressIDs(resultSet, totalPage, authorisation);
-//					}
-//				} else {
-//					// page no not invalid
-//					throw new Exception("Invalid page no");
-//				}
-//			} else {
-//				// missing village details : village ID
-//				throw new Exception("Invalid/missing village details");
-//			}
 		} catch (Exception e) {
 			throw new Exception(e.getMessage());
 		}
@@ -516,8 +483,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 					if (benAddressOBJ.getPermAddrLine3() != null)
 						benDetailsRMNCH_OBJ.setAddressLine3(benAddressOBJ.getPermAddrLine3());
 
-					// -----------------------------------------------------------------------------
-
 					// related benids
 					if (benDetailsRMNCH_OBJ.getRelatedBeneficiaryIdsDB() != null) {
 
@@ -531,7 +496,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 
 						benDetailsRMNCH_OBJ.setRelatedBeneficiaryIds(relatedBenIDs);
 					}
-					// ------------------------------------------------------------------------------
 
 					if (benDetailsOBJ.getCommunity() != null)
 						benDetailsRMNCH_OBJ.setCommunity(benDetailsOBJ.getCommunity());
@@ -648,7 +612,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 					resultMap.put("benficieryid", benDetailsRMNCH_OBJ.getBenficieryid());
 					resultMap.put("BenRegId", m.getBenRegId());
 
-
 					// adding asha id / created by - user id
 					if (benAddressOBJ.getCreatedBy() != null) {
 						Integer userID = rMNCHMBenMappingRepo.getUserIDByUserName(benAddressOBJ.getCreatedBy());
@@ -742,7 +705,6 @@ public NCD_TB_HRP_data getHRP_NCD_TB_SuspectedStatus(Long benRegID, String autho
 						response.setConfirmed_hrp(getConfirmedHRP(benRegID, visitCode, authorization, benDetails));
 						break;
 					case "ANC":
-//					response = getConfirmedNCD_TB_Common(benRegID, visitCode);
 						response.setConfirmed_hrp(getConfirmedHRP(benRegID, visitCode, authorization, benDetails));
 						break;
 					case "NCD care":
@@ -986,38 +948,4 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode
 		return response;
 	}
 
-//		String isTB = "no", isNCD = "no";
-//	Object obj = null;
-//		ArrayList<String> ncdList = new ArrayList<String>();
-//		if (visitCode != null && benRegID != null) {// add NCD care
-//			if (visitCategory.equalsIgnoreCase("PNC")) {
-//	obj=rMNCHCBACDetailsRepo.getDiagnosisProvidedPNC(benRegID,visitCode);
-//			} else
-//				obj = rMNCHCBACDetailsRepo.getDiagnosisProvidedExceptPNC(benRegID, visitCode);
-//			if (obj != null) {
-//				String diagnosis[] = ((String) obj).split("||");
-//				if (diagnosis.length > 0) {
-//					for (String s : diagnosis) {
-//						if (s.equalsIgnoreCase("Tuberculosis"))
-//							isTB = "yes";
-//						else if (s.equalsIgnoreCase("Diabetes mellitus") || s.equalsIgnoreCase("Hypertension")
-//								|| s.equalsIgnoreCase("Breast cancer")
-//								|| s.equalsIgnoreCase("Mental health disorder")) {
-//							isNCD = "yes";
-//							ncdList.add(s);
-//						}
-//
-//					}
-//				}
-//			}
-//		}
-//		Map<String, String> res = new HashMap<String, String>();
-//		// return yes,no
-//		res.put("suspected_ncd", "isNCD");
-//		res.put("suspected_tb", "isTB");
-//		res.put("suspected_hrp", "isHRP");
-//		res.put("confirmed_ncd_diseases", "ncdList.toString()");
-//		return new Gson().toJson(res);
-//	}
-
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/OutputResponse.java b/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
index 3fa14ddd..9068c0c1 100644
--- a/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
+++ b/src/main/java/com/iemr/common/identity/utils/OutputResponse.java
@@ -31,7 +31,6 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-// import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.LongSerializationPolicy;
 import com.google.gson.annotations.Expose;
@@ -39,21 +38,13 @@
 import lombok.Data;
 
 @Data
-public class OutputResponse
-{
+public class OutputResponse {
 	private static Logger logger = LoggerFactory.getLogger(OutputResponse.class);
 
 	@Expose
 	private JsonElement response;
 
-	/*
-	 * Response JSON: { "methodName" : "<Method_Name>", "dataObjectType" : "Object_Name", "dataJsonType		:	"object
-	 * or array or primitive or null" "data" : "<json of Object_Name>", "statusCode" : <number>, "statusMessage" :
-	 * "<message>" "statusMessageLong" : "<messageLong> }
-	 */
-
-	public static class Builder
-	{
+	public static class Builder {
 		private String methodName;
 		private String dataObjectType;
 		private String dataJsonType;
@@ -74,8 +65,7 @@ public static class Builder
 		public static final int MANDATORY_PARAMS_MISSING = 5008;
 		public static final int ILLEGAL_ACTION = 5009;
 
-		public Builder()
-		{
+		public Builder() {
 			this.methodName = "";
 			this.dataObjectType = "";
 			this.dataJsonType = "";
@@ -85,149 +75,102 @@ public Builder()
 			this.statusMessageLong = "";
 		}
 
-		public Builder setMethodName(String str)
-		{
+		public Builder setMethodName(String str) {
 			methodName = str;
 			return this;
 		}
 
-		public Builder setDataObjectType(String str)
-		{
+		public Builder setDataObjectType(String str) {
 			dataObjectType = str;
 			return this;
 		}
 
-		public Builder setDataJsonType(String str)
-		{
+		public Builder setDataJsonType(String str) {
 			dataJsonType = str;
 			return this;
 		}
 
-		public Builder setData(String str) throws JsonParseException, JsonSyntaxException
-		{
-			// JsonElement element = new JsonParser().parse(str);
+		public Builder setData(String str) throws JsonParseException, JsonSyntaxException {
 			data = str;
 			return this;
 		}
 
-		public Builder setStatusCode(Integer code)
-		{
+		public Builder setStatusCode(Integer code) {
 			statusCode = code;
 			return this;
 		}
 
-		public Builder setStatusMessage(String str)
-		{
+		public Builder setStatusMessage(String str) {
 			statusMessage = str;
 			return this;
 		}
 
-		public Builder setStatusMessageLong(String str)
-		{
+		public Builder setStatusMessageLong(String str) {
 			statusMessageLong = str;
 			return this;
 		}
 
-		public Builder setErrorMessage(Throwable thrown)
-		{
+		public Builder setErrorMessage(Throwable thrown) {
 
 			Date currDate = Calendar.getInstance().getTime();
 			logger.info("error happened due to " + thrown.getClass().getSimpleName() + " at " + currDate.toString());
-			switch (thrown.getClass().getSimpleName())
-			{
-				case "MissingMandatoryFieldsException":
-					statusCode = MANDATORY_PARAMS_MISSING;
-					statusMessage = "Missing Mandatory Parameters.";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "IEMRException":
-					statusCode = USERID_FAILURE;
-					statusMessage = "User login failed";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "JSONException":
-					statusCode = OBJECT_FAILURE;
-					statusMessage = "Invalid object conversion";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "IllegalActionException":
-					statusCode = ILLEGAL_ACTION;
-					statusMessage = "Illegal Action performed. Please contact your adminstrator.";
-					statusMessageLong = thrown.getMessage();
-					break;
-
-				case "SQLException":
-				case "ParseException":
-				case "NullPointerException":
-				case "SQLGrammarException":
-				case "ArrayIndexOutOfBoundsException":
-				case "ConstraintViolationException":
-					this.statusCode = CODE_EXCEPTION;
-					statusMessage = "Failed with critical errors at " + currDate.toString()
-							+ ".Please try after some time. " + "If error is still seen, contact your administrator.";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "IOException":
-				case "ConnectException":
-				case "ConnectIOException":
-					this.statusCode = ENVIRONMENT_EXCEPTION;
-					statusMessage = "Failed with connection issues at " + currDate.toString()
-							+ "Please try after some time. " + "If error is still seen,  contact your administrator.";
-					statusMessageLong = thrown.getMessage();
-					break;
-				case "JDBCException":
-					this.statusCode = ENVIRONMENT_EXCEPTION;
-					statusMessage = "Failed with DB connection issues at " + currDate.toString()
-							+ ". Please try after some time. " + "If error is still seen,  contact your administrator.";
-					statusMessageLong = thrown.getMessage();
-					break;
-				default:
-					statusCode = GENERIC_FAILURE;
-					statusMessage = "Failed with generic exception";
-					statusMessageLong = thrown.getMessage();
-					break;
+			switch (thrown.getClass().getSimpleName()) {
+			case "MissingMandatoryFieldsException":
+				statusCode = MANDATORY_PARAMS_MISSING;
+				statusMessage = "Missing Mandatory Parameters.";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "IEMRException":
+				statusCode = USERID_FAILURE;
+				statusMessage = "User login failed";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "JSONException":
+				statusCode = OBJECT_FAILURE;
+				statusMessage = "Invalid object conversion";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "IllegalActionException":
+				statusCode = ILLEGAL_ACTION;
+				statusMessage = "Illegal Action performed. Please contact your adminstrator.";
+				statusMessageLong = thrown.getMessage();
+				break;
+
+			case "SQLException":
+			case "ParseException":
+			case "NullPointerException":
+			case "SQLGrammarException":
+			case "ArrayIndexOutOfBoundsException":
+			case "ConstraintViolationException":
+				this.statusCode = CODE_EXCEPTION;
+				statusMessage = "Failed with critical errors at " + currDate.toString()
+						+ ".Please try after some time. " + "If error is still seen, contact your administrator.";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "IOException":
+			case "ConnectException":
+			case "ConnectIOException":
+				this.statusCode = ENVIRONMENT_EXCEPTION;
+				statusMessage = "Failed with connection issues at " + currDate.toString()
+						+ "Please try after some time. " + "If error is still seen,  contact your administrator.";
+				statusMessageLong = thrown.getMessage();
+				break;
+			case "JDBCException":
+				this.statusCode = ENVIRONMENT_EXCEPTION;
+				statusMessage = "Failed with DB connection issues at " + currDate.toString()
+						+ ". Please try after some time. " + "If error is still seen,  contact your administrator.";
+				statusMessageLong = thrown.getMessage();
+				break;
+			default:
+				statusCode = GENERIC_FAILURE;
+				statusMessage = "Failed with generic exception";
+				statusMessageLong = thrown.getMessage();
+				break;
 			}
 			return this;
 		}
 
-		// private JsonElement parser(String str) throws JsonParseException, JsonSyntaxException {
-		// JsonElement element = new JsonParser().parse(str);
-		// return element;
-		// }
-		//
-		// private JsonObject createJsonObject(String name, Object value) throws JsonParseException, JsonSyntaxException
-		// {
-		// JsonObject element = new JsonObject();
-		// if(value instanceof Boolean) {
-		// element.addProperty(name, (Boolean)value);
-		// } else if(value instanceof Character) {
-		// element.addProperty(name, (Character)value);
-		// } else if(value instanceof Number) {
-		// element.addProperty(name, (Number)value);
-		// } else if(value instanceof String) {
-		// element.addProperty(name, (String)value);
-		// } else if(value instanceof JsonElement) {
-		// element.add(name, (JsonElement)value);
-		// }
-		//
-		// return element;
-		// }
-
-		/**
-		 * To Do for later
-		 * 
-		 * @return
-		 */
-		// // SUNIL TODO: Add this when needed!
-		// private JsonElement createJsonArray(List<Object> list, Type type) {
-		// Type typeOfSrc = new TypeToken<List<FeedbackDTOOutbound>>(){private static final long serialVersionUID =
-		// 1L;}.getType();
-		// JsonElement element = new JsonArray();
-		// return element;
-		// }
-
-		public OutputResponse build()
-		{
+		public OutputResponse build() {
 			OutputResponse response = new OutputResponse();
 			JsonObject elements = new JsonObject();
 			elements.addProperty("methodName", methodName);
@@ -244,14 +187,12 @@ public OutputResponse build()
 		}
 	}
 
-	protected OutputResponse()
-	{
+	protected OutputResponse() {
 
 	}
 
 	@Override
-	public String toString()
-	{
+	public String toString() {
 		GsonBuilder builder = new GsonBuilder();
 		builder.excludeFieldsWithoutExposeAnnotation();
 		builder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
diff --git a/src/main/java/com/iemr/common/identity/utils/Utilities.java b/src/main/java/com/iemr/common/identity/utils/Utilities.java
index 70551dc4..f4186731 100644
--- a/src/main/java/com/iemr/common/identity/utils/Utilities.java
+++ b/src/main/java/com/iemr/common/identity/utils/Utilities.java
@@ -23,17 +23,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iemr.common.identity.controller.IdentityController;
 
 public class Utilities {
-	//private static final Logger logger = LoggerFactory.getLogger(Utilities.class);
-	
 	/**
 	 * Gets the json as string.
 	 *
@@ -41,6 +35,7 @@ public class Utilities {
 	 * @return the json as string
 	 */
 	private Logger logger = LoggerFactory.getLogger(IdentityController.class);
+
 	public String getJsonAsString(Object obj) {
 		ObjectMapper mapper = new ObjectMapper();
 		StringBuilder sb = new StringBuilder();
@@ -49,7 +44,7 @@ public String getJsonAsString(Object obj) {
 		} catch (JsonProcessingException e) {
 			logger.error(e.getMessage());
 		}
-		
+
 		return sb.toString();
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java b/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
index 468186d8..0a3628d5 100644
--- a/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
+++ b/src/main/java/com/iemr/common/identity/utils/config/ConfigProperties.java
@@ -56,14 +56,9 @@ private static void initalizeProperties() {
 		if (properties == null) {
 			properties = new Properties();
 
-			// FileInputStream fis;
 			try {
-				// this.getClass().getResourceAsStream(
-
 				InputStream fis = ConfigProperties.class.getResourceAsStream("/application.properties");
 				properties.load(fis);
-				// properties.
-				// fis.close();
 			} catch (IOException e) {
 				logger.error("Loading of config file failed with error " + e.getLocalizedMessage(), e);
 			}
@@ -122,7 +117,6 @@ public static String getPropertyByName(String propertyName) {
 			if (properties == null) {
 				initalizeProperties();
 			}
-			// result = environment.getProperty(propertyName);
 			result = properties.getProperty(propertyName).trim();
 		} catch (Exception e) {
 			logger.error(propertyName + " retrival failed.", e);
diff --git a/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java b/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
index d2a30279..e6d41d8a 100644
--- a/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/utils/gateway/email/GenericEmailServiceImpl.java
@@ -43,9 +43,6 @@ public void sendEmail(String jsonObject, String template) {
 		String subject = requestObj.getString("subject");
 		String message = requestObj.getString("message");
 
-		// TODO
-		// JSONObject templateObj = new JSONObject(template);
-
 		mailMessage.setTo(to);
 		mailMessage.setFrom(from);
 		mailMessage.setSubject(subject);
@@ -72,31 +69,5 @@ public void sendEmail(String jsonObject) {
 
 	@Override
 	public void sendEmailWithAttachment(String jsonObject, String template) {
-		// TODO Auto-generated method stub
-
 	}
-
-	// public static void main(String[] args)
-	// {
-	// GenericEmailServiceImpl impl = new GenericEmailServiceImpl();
-	// JSONObject test = new JSONObject();
-	// test.put("to", "vinay.chidambara@wipro.com, vinay.sompur@gmail.com");
-	// test.put("from", "vinay.sompur@gmail.com");
-	// test.put("subject", "Test email event");
-	// test.put("message", "Testing email for demo");
-	// impl.sendEmail(test.toString());
-	// }
-
-	// public static void main(String[] args) throws Exception
-	// {
-	// GenericEmailServiceImpl impl = new GenericEmailServiceImpl();
-	// JSONObject test = new JSONObject();
-	// test.put("to", "vinay.chidambara@wipro.com, vinay.sompur@gmail.com");
-	// test.put("from", "vinay.sompur@gmail.com");
-	// test.put("subject", "Test email event");
-	// test.put("message", "Testing email for demo");
-	// SpringApplication.run(GenericEmailServiceImpl.class, args);
-	// impl.sendEmail(test.toString());
-	// }
-
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
index 1021d8dd..40ff0a55 100644
--- a/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
+++ b/src/main/java/com/iemr/common/identity/utils/http/HTTPRequestInterceptor.java
@@ -84,7 +84,6 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 					status = false;
 					break;
 				default:
-					//validator.checkKeyExists(authorization, request.getRemoteAddr());
 					break;
 				}
 			} catch (Exception e) {
diff --git a/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
index 5e349dfd..ad5ed11f 100644
--- a/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
+++ b/src/main/java/com/iemr/common/identity/utils/http/HttpUtils.java
@@ -62,30 +62,15 @@ public HttpUtils() {
 			headers.add("Content-Type", "application/json");
 		}
 	}
-	private Logger logger = LoggerFactory.getLogger(IdentityController.class);
-	// public HttpUtils() {
-	// if (rest == null) {
-	// rest = new RestTemplate();
-	// headers = new HttpHeaders();
-	// headers.add("Content-Type", "application/json");
-	// }
-	// }
 
-	// @Bean
-	// public HttpUtils httpUtils() {
-	// return new HttpUtils();
-	// }
+	private Logger logger = LoggerFactory.getLogger(IdentityController.class);
 
 	public String get(String uri) {
 		String body;
 		HttpEntity<String> requestEntity = new HttpEntity<String>("", headers);
 		ResponseEntity<String> responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class);
 		setStatus(responseEntity.getStatusCode());
-		// if (status == HttpStatus.OK){
 		body = responseEntity.getBody();
-		// }else{
-		// responseEntity
-		// }
 		return body;
 	}
 
@@ -122,7 +107,6 @@ public String post(String uri, String data, HashMap<String, Object> header) {
 		if (header.containsKey(headers.AUTHORIZATION)) {
 			headers.add(headers.AUTHORIZATION, header.get(headers.AUTHORIZATION).toString());
 		}
-		// headers.add("Content-Type", MediaType.APPLICATION_JSON);
 		ResponseEntity<String> responseEntity = new ResponseEntity(HttpStatus.BAD_REQUEST);
 		HttpEntity<String> requestEntity;
 		requestEntity = new HttpEntity<String>(data, headers);
@@ -158,16 +142,14 @@ public String uploadFile(String uri, String data, HashMap<String, Object> header
 				multiPart.field("docPath", data);
 				headers.add("Content-Type", MediaType.APPLICATION_JSON);
 				requestEntity = new HttpEntity<FormDataMultiPart>(multiPart, headers);// new
-																						// HttpEntity<String>(multiPart,
-																						// headers);
 				responseEntity = rest.exchange(uri, HttpMethod.POST, requestEntity, String.class);
 			} catch (FileNotFoundException e) {
 				logger.error(e.getMessage());
 			} finally {
-				if(multiPart!=null)
-				multiPart.close();
-				if(is!=null)
-				is.close();
+				if (multiPart != null)
+					multiPart.close();
+				if (is != null)
+					is.close();
 			}
 		} else {
 			HttpEntity<String> requestEntity;
diff --git a/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java b/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
index 74d82471..4c8db37d 100644
--- a/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
+++ b/src/main/java/com/iemr/common/identity/utils/mapper/InputMapper.java
@@ -43,22 +43,11 @@ public class InputMapper {
 	static GsonBuilder builder;
 	ExclusionStrategy strategy;
 	Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
-	// @Autowired
-	// ConfigProperties configProperties;
-
-	// @Autowired
-	// SessionObject sessionObject;
-
-	// public void setSessionObject(SessionObject sessionObject)
-	// {
-	// this.sessionObject = sessionObject;
-	// }
 
 	public InputMapper() {
 		if (builder == null) {
 			builder = new GsonBuilder();
 			builder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
-			// builder.addDeserializationExclusionStrategy(strategy)
 		}
 	}
 
@@ -83,35 +72,4 @@ public <T> T fromJson(JsonElement json, Class<T> classOfT) throws IEMRException
 		return builder.create().fromJson(json, classOfT);
 	}
 
-	/**
-	 * @param json
-	 * @throws IEMRException This function will check for the following things and
-	 *                       throws login exception if any one fails 1. Get the
-	 *                       session details from the redis 2. IP address in request
-	 *                       and the logged in IP address should be same.
-	 */
-	// private void valildate(String json) throws IEMRException
-	// {
-	// Object obj = new JsonParser().parse(json);
-	// try
-	// {
-	// if (obj instanceof JsonObject)
-	// {
-	// JSONObject reqObj = new JSONObject(json);
-	// String key = reqObj.getString("key");
-	// // Validator.checkKeyExists(key);
-	// } else if (obj instanceof JsonObject)
-	// {
-	// // to do
-	// } else
-	// {
-	// // throw new IEMRException("Invalid login key");
-	// logger.info("Invalid login key");
-	// }
-	// } catch (Exception e)
-	// {
-	// // throw new IEMRException("Invalid login key");
-	// logger.info("Invalid login key");
-	// }
-	// }
 }
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java b/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java
deleted file mode 100644
index dc6a19f7..00000000
--- a/src/main/java/com/iemr/common/identity/utils/redis/RedisConnection.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.utils.redis;
-
-public class RedisConnection {
-	// // static ConfigProperties configProperties;
-	// // @Autowired(required = true)
-	// // @Required
-	// // public void setConfigProperties(ConfigProperties configProperties)
-	// // {
-	// // if (configProperties == null) {
-	// // configProperties = new ConfigProperties();
-	// // }
-	// // this.configProperties = configProperties;
-	// // }
-	// static JedisPool jedisPool = null;
-	// static int paasConnectionCounter = 0;
-	// static int redisPort;// = new ConfigProperties().getRedisPort();
-	// static String redisURL;// = new ConfigProperties().getRedisUrl();
-	//
-	// private void intializeRedisPool() throws NumberFormatException {
-	// // if (configProperties == null) {
-	// // configProperties = new ConfigProperties();
-	// // }
-	// redisPort = ConfigProperties.getRedisPort();
-	// redisURL = ConfigProperties.getRedisUrl();
-	// JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
-	// jedisPoolConfig.setMaxIdle(1);
-	// jedisPoolConfig.setMinIdle(1);
-	// jedisPoolConfig.setMaxTotal(500);
-	//
-	// // jedisPool = new JedisPool(jedisPoolConfig, "localhost", 6379);
-	// jedisPool = new JedisPool(jedisPoolConfig, redisURL, redisPort);
-	// }
-	//
-	// public Jedis getRedisConnection() throws RedisSessionException {
-	// Jedis jedis = null;
-	// try {
-	// if (jedisPool == null) {
-	// intializeRedisPool();
-	// }
-	// jedis = jedisPool.getResource();
-	// } catch (JedisConnectionException | JedisDataException e) {
-	// throw new RedisSessionException("Unable to connect to Redis server", e);
-	// } catch (Exception e) {
-	// if ((e instanceof SocketException)) {
-	// throw new RedisSessionException("Not a proper config format", e);
-	// }
-	// throw new RedisSessionException("Redis exception occured on fetch", e);
-	// }
-	// return jedis;
-	// }
-	//
-	// public void closeRedisConnection(Jedis jedis) throws
-	// JedisConnectionException, JedisDataException {
-	// if ((jedisPool != null) && (jedis != null)) {
-	// jedisPool.returnResource(jedis);
-	// jedis = null;
-	// }
-	// }
-}
diff --git a/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java b/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
index 291756c6..04a3f1d8 100644
--- a/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
+++ b/src/main/java/com/iemr/common/identity/utils/redis/RedisStorage.java
@@ -32,56 +32,26 @@
 
 @Component
 public class RedisStorage {
-	// @Autowired
-	// private RedisConnection redisConnection;// = new RedisConnection();
 	@Autowired
 	private LettuceConnectionFactory connection;
 
 	Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
-	// @Autowired(required = true)
-	// @Required
-	// public void setRedisConnection(RedisConnection redisConnection)
-	// {
-	// if (redisConnection == null)
-	// {
-	// redisConnection = new RedisConnection();
-	// }
-	// this.redisConnection = redisConnection;
-	// }
-
-	// public RedisStorage()
-	// {
-	// redisConnection = new RedisConnection();
-	// }
-
 	public String setObject(String key, String value, int expirationTime) throws RedisSessionException {
 		RedisConnection redCon = connection.getConnection();
-		// redCon.get(key.getBytes());
-		// redCon.expire(key.getBytes(), expirationTime);
-		// redCon.set(key.getBytes(), value.getBytes(),
-		// Expiration.seconds(expirationTime), SetOption.UPSERT);
 		byte[] sessionData = redCon.get(key.getBytes());
 		String userRespFromRedis = null;
 		if (sessionData != null) {
 			userRespFromRedis = new String(redCon.get(key.getBytes()));
 		}
-		// Jedis jedis = redisConnection.getRedisConnection();
-		// userRespFromRedis = jedis.get(key);
 		if ((userRespFromRedis == null) || (userRespFromRedis.isEmpty())) {
 			logger.info("updating session time of redis for " + key);
 			redCon.set(key.getBytes(), value.getBytes(), Expiration.seconds(expirationTime), SetOption.UPSERT);
-			// jedis.expire(key, expirationTime);
 		}
-		// redisConnection.closeRedisConnection(jedis);
 		return key;
 	}
 
 	public String getObject(String key, Boolean extendExpirationTime, int expirationTime) throws RedisSessionException {
-		// String userRespFromRedis = null;
-		// Jedis jedis = redisConnection.getRedisConnection();
-		// userRespFromRedis = jedis.get(key);
-
 		RedisConnection redCon = connection.getConnection();
 		byte[] sessionData = redCon.get(key.getBytes());
 		String userRespFromRedis = null;
@@ -89,56 +59,36 @@ public String getObject(String key, Boolean extendExpirationTime, int expiration
 			userRespFromRedis = new String(redCon.get(key.getBytes()));
 		}
 		if ((userRespFromRedis != null) && (userRespFromRedis.trim().length() != 0)) {
-			// if (extendExpirationTime.booleanValue())
-			// {
-			// jedis.expire(key, expirationTime);
-			// }
-
 			logger.info("updating session time of redis for " + key);
 			redCon.expire(key.getBytes(), expirationTime);
 		} else {
 			throw new RedisSessionException("Unable to fetch session object from Redis server");
 		}
-		// redisConnection.closeRedisConnection(jedis);
 		return userRespFromRedis;
 	}
 
 	public Long deleteObject(String key) throws RedisSessionException {
 		RedisConnection redCon = connection.getConnection();
 		Long userRespFromRedis = Long.valueOf(0L);
-		// Jedis jedis = redisConnection.getRedisConnection();
-		// userRespFromRedis = jedis.del(key);
 		userRespFromRedis = redCon.del(key.getBytes());
-		// redisConnection.closeRedisConnection(jedis);
 		return userRespFromRedis;
 	}
 
 	public String updateObject(String key, String value, Boolean extendExpirationTime, int expirationTime)
 			throws RedisSessionException {
 		RedisConnection redCon = connection.getConnection();
-		// String userRespFromRedis = null;
-		// Jedis jedis = redisConnection.getRedisConnection();
-
 		byte[] sessionData = redCon.get(key.getBytes());
 		String userRespFromRedis = null;
 		if (sessionData != null) {
 			userRespFromRedis = new String(redCon.get(key.getBytes()));
 		}
-		// userRespFromRedis = jedis.get(key);
 		if ((userRespFromRedis != null) && (userRespFromRedis.trim().length() != 0)) {
-			// jedis.set(key, value);
-			// if (extendExpirationTime.booleanValue())
-			// {
-			// jedis.expire(key, expirationTime);
-			// }
-
 			logger.info("updating session time of redis for " + key);
 			redCon.set(key.getBytes(), value.getBytes(), Expiration.seconds(expirationTime), SetOption.UPSERT);
 		} else {
 			throw new RedisSessionException("Unable to fetch session object from Redis server");
 		}
 
-		// redisConnection.closeRedisConnection(jedis);
 		return key;
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java b/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
index e5ec994e..65d8cc63 100644
--- a/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
+++ b/src/main/java/com/iemr/common/identity/utils/response/OutputResponse.java
@@ -35,8 +35,7 @@
 import com.google.gson.LongSerializationPolicy;
 import com.google.gson.annotations.Expose;
 
-public class OutputResponse
-{
+public class OutputResponse {
 	@Expose
 	private Object data;
 	Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
@@ -59,26 +58,19 @@ public class OutputResponse
 	private static final String RESPONSE = "{\"response\":\"$$STRING\"}";
 	private static final String RESPONSE_VALUE = "$$STRING";
 
-	public void setResponse(String message)
-	{
+	public void setResponse(String message) {
 		JsonArray ja = null;
-		try
-		{
+		try {
 			Object obj = new JsonParser().parse(message);
-			if ((obj instanceof JsonArray))
-			{
+			if ((obj instanceof JsonArray)) {
 				ja = (JsonArray) obj;
 				this.data = ja;
-			} else if ((obj instanceof JsonObject))
-			{
+			} else if ((obj instanceof JsonObject)) {
 				this.data = obj;
-			} else
-			{
+			} else {
 				this.data = new JsonParser().parse(RESPONSE.replace(RESPONSE_VALUE, message));
-				// this.data = message;
 			}
-		} catch (Exception exe)
-		{
+		} catch (Exception exe) {
 			this.data = message;
 			this.data = new JsonParser().parse(RESPONSE.replace(RESPONSE_VALUE, message));
 		}
@@ -88,85 +80,77 @@ public void setResponse(String message)
 
 	}
 
-	public void setError(Throwable thrown)
-	{
+	public void setError(Throwable thrown) {
 		Date currDate = Calendar.getInstance().getTime();
 		logger.info("error happened due to " + thrown.getClass().getSimpleName() + " at " + currDate.toString());
-		switch (thrown.getClass().getSimpleName())
-		{
-			case "IEMRException":
-				this.statusCode = USERID_FAILURE;
-				status = "User login failed";
-				errorMessage = thrown.getMessage();
-				break;
-			case "JSONException":
-				this.statusCode = OBJECT_FAILURE;
-				status = "Invalid object conversion";
-				errorMessage = "Invalid object conversion";
-				break;
-			case "SQLException":
-			case "ParseException":
-			case "NullPointerException":
-			case "SQLGrammarException":
-			case "ArrayIndexOutOfBoundsException":
-			case "ConstraintViolationException":
-				this.statusCode = CODE_EXCEPTION;
-				status = "Failed with critical errors at " + currDate.toString() + ".Please try after some time. "
-						+ "If error is still seen, contact your administrator.";
-				errorMessage = thrown.getMessage();
-				break;
-			case "IOException":
-			case "ConnectException":
-			case "ConnectIOException":
-				this.statusCode = ENVIRONMENT_EXCEPTION;
-				status = "Failed with connection issues at " + currDate.toString() + "Please try after some time. "
-						+ "If error is still seen,  contact your administrator.";
-				errorMessage = thrown.getMessage();
-				break;
-			case "JDBCException":
-				this.statusCode = ENVIRONMENT_EXCEPTION;
-				status = "Failed with DB connection issues at " + currDate.toString() + ". Please try after some time. "
-						+ "If error is still seen,  contact your administrator.";
-				errorMessage = thrown.getMessage();
-				break;
-			default:
-				this.statusCode = GENERIC_FAILURE;
-				status = "Failed with " + thrown.getMessage() + " at " + currDate.toString()
-						+ ".Please try after some time. If error is still seen, contact your administrator.";
-				errorMessage = thrown.getMessage();
-				break;
+		switch (thrown.getClass().getSimpleName()) {
+		case "IEMRException":
+			this.statusCode = USERID_FAILURE;
+			status = "User login failed";
+			errorMessage = thrown.getMessage();
+			break;
+		case "JSONException":
+			this.statusCode = OBJECT_FAILURE;
+			status = "Invalid object conversion";
+			errorMessage = "Invalid object conversion";
+			break;
+		case "SQLException":
+		case "ParseException":
+		case "NullPointerException":
+		case "SQLGrammarException":
+		case "ArrayIndexOutOfBoundsException":
+		case "ConstraintViolationException":
+			this.statusCode = CODE_EXCEPTION;
+			status = "Failed with critical errors at " + currDate.toString() + ".Please try after some time. "
+					+ "If error is still seen, contact your administrator.";
+			errorMessage = thrown.getMessage();
+			break;
+		case "IOException":
+		case "ConnectException":
+		case "ConnectIOException":
+			this.statusCode = ENVIRONMENT_EXCEPTION;
+			status = "Failed with connection issues at " + currDate.toString() + "Please try after some time. "
+					+ "If error is still seen,  contact your administrator.";
+			errorMessage = thrown.getMessage();
+			break;
+		case "JDBCException":
+			this.statusCode = ENVIRONMENT_EXCEPTION;
+			status = "Failed with DB connection issues at " + currDate.toString() + ". Please try after some time. "
+					+ "If error is still seen,  contact your administrator.";
+			errorMessage = thrown.getMessage();
+			break;
+		default:
+			this.statusCode = GENERIC_FAILURE;
+			status = "Failed with " + thrown.getMessage() + " at " + currDate.toString()
+					+ ".Please try after some time. If error is still seen, contact your administrator.";
+			errorMessage = thrown.getMessage();
+			break;
 		}
 		logger.error("Failure happend with " + thrown.getMessage() + "at " + currDate.toString(), thrown);
 	}
 
-	public void setError(int errorCode, String message, String status)
-	{
+	public void setError(int errorCode, String message, String status) {
 		this.errorMessage = message;
 		this.status = status;
 		this.statusCode = errorCode;
 	}
 
-	public void setError(int errorCode, String message)
-	{
+	public void setError(int errorCode, String message) {
 		setError(errorCode, message, message);
 	}
 
-	public boolean isSuccess()
-	{
+	public boolean isSuccess() {
 		return (this.statusCode == SUCCESS);
 	}
 
 	/**
 	 * @return the data
 	 */
-	public String getData()
-	{
+	public String getData() {
 		JSONObject obj = new JSONObject(toString());
-		if (obj.has("data"))
-		{
+		if (obj.has("data")) {
 			return obj.get("data").toString();
-		} else
-		{
+		} else {
 			return null;
 		}
 	}
@@ -174,55 +158,36 @@ public String getData()
 	/**
 	 * @return the statusCode
 	 */
-	public int getStatusCode()
-	{
+	public int getStatusCode() {
 		return statusCode;
 	}
 
 	/**
 	 * @return the errorMessage
 	 */
-	public String getErrorMessage()
-	{
+	public String getErrorMessage() {
 		return errorMessage;
 	}
 
 	/**
 	 * @return the status
 	 */
-	public String getStatus()
-	{
+	public String getStatus() {
 		return status;
 	}
 
 	@Override
-	public String toString()
-	{
-		// return new Gson().toJson(this);
-		// Gson gson = OutputMapper.gson();
+	public String toString() {
 		GsonBuilder builder = new GsonBuilder();
 		builder.excludeFieldsWithoutExposeAnnotation().setLongSerializationPolicy(LongSerializationPolicy.STRING);
-		// builder.disableInnerClassSerialization();
 		return builder.create().toJson(this);
-		// JSONObject response = new JSONObject();
-		// response.put("data", data);
-		// response.put("statusCode", statusCode);
-		// response.put("status", status);
-		// response.put("errorMessage", errorMessage);
-		// return response.toString();
 	}
 
-	public String toStringWithSerialization()
-	{
+	public String toStringWithSerialization() {
 		GsonBuilder builder = new GsonBuilder();
 		builder.excludeFieldsWithoutExposeAnnotation();
 		builder.serializeNulls().setLongSerializationPolicy(LongSerializationPolicy.STRING);
 		return builder.create().toJson(this);
 	}
 
-	// public static void main(String[] args) {
-	// OutputResponse resp = new OutputResponse();
-	// resp.setResponse("{testing: [test]}");
-	// System.out.println(resp.toString());
-	// }
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java b/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
index 6e1d75a5..af0cb84d 100644
--- a/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
+++ b/src/main/java/com/iemr/common/identity/utils/sessionobject/SessionObject.java
@@ -33,50 +33,23 @@
 
 @Component
 public class SessionObject {
-
-	// //
-	// @Autowired(required = true)
-	// // @Required
-	// public void setConfigProperties(ConfigProperties configProperties)
-	// {
-	// // if (configProperties == null)
-	// // {
-	// // configProperties = new ConfigProperties();
-	// // }
-	// this.configProperties = configProperties;
-	// }
-
 	private RedisStorage objectStore;
 
-	@Autowired
-	// @Required
 	public void setObjectStore(RedisStorage objectStore) {
-		// if (objectStore == null)
-		// {
-		// objectStore = new RedisStorage();
-		// }
 		this.objectStore = objectStore;
 	}
 
 	public SessionObject() {
-		// configProperties = new ConfigProperties();
-		// objectStore = new RedisStorage();
-		// if (objectStore == null)
-		// {
-		// objectStore = new RedisStorage();
-		// }
 		extendExpirationTime = ConfigProperties.getExtendExpiryTime();
 		sessionExpiryTime = ConfigProperties.getSessionExpiryTime();
 	}
 
-	private boolean extendExpirationTime;// =
-											// configProperties.getExtendExpiryTime();
-	private int sessionExpiryTime;// = configProperties.getSessionExpiryTime();
+	private boolean extendExpirationTime;
+	private int sessionExpiryTime;
 
 	public String getSessionObject(String key) throws RedisSessionException {
 		Boolean extendExpirationTime = ConfigProperties.getExtendExpiryTime();
 		Integer sessionExpiryTime = ConfigProperties.getSessionExpiryTime();
-		// RedisStorage objectStore = new RedisStorage();
 		return objectStore.getObject(key, extendExpirationTime, sessionExpiryTime);
 	}
 
@@ -90,9 +63,9 @@ public String updateSessionObject(String key, String value) throws RedisSessionE
 		Boolean extendExpirationTime = ConfigProperties.getExtendExpiryTime();
 		Integer sessionExpiryTime = ConfigProperties.getSessionExpiryTime();
 		updateConcurrentSessionObject(key, value, extendExpirationTime, sessionExpiryTime);
-		// RedisStorage objectStore = new RedisStorage();
 		return objectStore.updateObject(key, value, extendExpirationTime, sessionExpiryTime);
 	}
+
 	private void updateConcurrentSessionObject(String key, String value, Boolean extendExpirationTime,
 			Integer sessionExpiryTime) {
 		try {
@@ -108,31 +81,9 @@ private void updateConcurrentSessionObject(String key, String value, Boolean ext
 
 		}
 	}
+
 	public void deleteSessionObject(String key) throws RedisSessionException {
-		// RedisStorage objectStore = new RedisStorage();
 		System.out.println(objectStore.deleteObject(key));
 	}
 
-	// public static void test(String[] args)
-	// {
-	// SessionObject obj = new SessionObject();
-	// JSONObject testdata = new JSONObject();
-	// try
-	// {
-	// System.out.println("Set Object " + obj.getSessionObject("test1234"));
-	// System.out.println("Set Object " + obj.setSessionObject("test1234",
-	// testdata.toString()));
-	// System.out.println("Set Object " + obj.getSessionObject("test1234"));
-	// testdata.put("userName", "test");
-	// // testdata.put("validity", obj.sessionExpiryTime);
-	// System.out.println("Set Object " + obj.updateSessionObject("test1234",
-	// testdata.toString()));
-	// System.out.println("Set Object " + obj.getSessionObject("test1234"));
-	// obj.deleteSessionObject("test1234");
-	// System.out.println("Set Object " + obj.getSessionObject("test1234"));
-	// } catch (RedisSessionException | JSONException e)
-	// {
-	// e.printStackTrace();
-	// }
-	// }
 }
diff --git a/src/main/java/com/iemr/common/identity/utils/validator/Validator.java b/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
index 35d7aaec..595ba715 100644
--- a/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
+++ b/src/main/java/com/iemr/common/identity/utils/validator/Validator.java
@@ -34,58 +34,38 @@
 import com.iemr.common.identity.utils.redis.RedisSessionException;
 import com.iemr.common.identity.utils.sessionobject.SessionObject;
 
-
-
 @Service
-public class Validator
-{
-	// private static SessionObject session;
-
+public class Validator {
 	private SessionObject session;
 
 	private static Boolean enableIPValidation = false;
 
 	@Autowired(required = true)
 	@Required
-	public void setSessionObject(SessionObject sessionObject)
-	{
+	public void setSessionObject(SessionObject sessionObject) {
 		this.session = sessionObject;
 	}
 
-	// private static void setSessionObject() {
-	// if (session == null) {
-	// session = new SessionObject();
-	// }
-	// }
-
-	public Validator()
-	{
-		if (!enableIPValidation)
-		{
+	public Validator() {
+		if (!enableIPValidation) {
 			enableIPValidation = ConfigProperties.getBoolean("enableIPValidation");
 		}
 	}
 
 	private Logger logger = LoggerFactory.getLogger(Validator.class);
 
-	public JSONObject updateCacheObj(JSONObject responseObj, String key, String ipKey)
-	{
-		try
-		{
+	public JSONObject updateCacheObj(JSONObject responseObj, String key, String ipKey) {
+		try {
 			Boolean loggedFromDifferentIP = false;
 			String loginKey = key;
 			String status = "login failed";
-			try
-			{
+			try {
 				responseObj.put("sessionStatus", "session creation failed");
 				String sessionData = session.getSessionObject(key);
-				if (enableIPValidation)
-				{
-					if (sessionData != null && sessionData.trim().length() > 0)
-					{
+				if (enableIPValidation) {
+					if (sessionData != null && sessionData.trim().length() > 0) {
 						JSONObject sessionObj = new JSONObject(sessionData);
-						if (!sessionObj.getString("loginIPAddress").equals(responseObj.getString("loginIPAddress")))
-						{
+						if (!sessionObj.getString("loginIPAddress").equals(responseObj.getString("loginIPAddress"))) {
 							logger.error("Logged in IP : " + sessionObj.getString("loginIPAddress") + "\tRequest IP : "
 									+ responseObj.getString("loginIPAddress"));
 							loggedFromDifferentIP = true;
@@ -93,49 +73,39 @@ public JSONObject updateCacheObj(JSONObject responseObj, String key, String ipKe
 						}
 					}
 				}
-			} catch (RedisSessionException e)
-			{
+			} catch (RedisSessionException e) {
 				logger.error("Session validation failed with exception", e);
 			}
-			if (!loggedFromDifferentIP)
-			{
+			if (!loggedFromDifferentIP) {
 				status = "login success";
 				session.setSessionObject(key, responseObj.toString());
-			} else
-			{
+			} else {
 				responseObj = new JSONObject();
 			}
 			responseObj.put("key", loginKey);
 			responseObj.put("sessionStatus", status);
-		} catch (RedisSessionException | JSONException e)
-		{
+		} catch (RedisSessionException | JSONException e) {
 			logger.error("Session validation failed with exception", e);
 		}
 		return responseObj;
 	}
 
-	public String getSessionObject(String key) throws RedisSessionException
-	{
+	public String getSessionObject(String key) throws RedisSessionException {
 		return session.getSessionObject(key);
 	}
 
-	public void checkKeyExists(String loginKey, String ipAddress) throws IEMRException
-	{
-		try
-		{
+	public void checkKeyExists(String loginKey, String ipAddress) throws IEMRException {
+		try {
 			String sessionString = session.getSessionObject(loginKey);
 			JSONObject sessionObj = new JSONObject(sessionString);
-			if (enableIPValidation)
-			{
-				if (!sessionObj.getString("loginIPAddress").equals(ipAddress))
-				{
+			if (enableIPValidation) {
+				if (!sessionObj.getString("loginIPAddress").equals(ipAddress)) {
 					logger.error(
 							"Logged in IP : " + sessionObj.getString("loginIPAddress") + "\tRequest IP : " + ipAddress);
 					throw new Exception();
-				} 
+				}
 			}
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			throw new IEMRException("Invalid login key or session is expired");
 		}
 	}
