diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 782b7586..3cd6d75e 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -458,7 +458,6 @@ public class IdentityController {
 		}
 
 		IdentityEditDTO identity = InputMapper.getInstance().gson().fromJson(json, IdentityEditDTO.class);
-		// MBeneficiarymapping map;
 		try {
 			svc.editIdentity(identity);
 			String response = getSuccessResponseString("Updated successfully", 200, "success", "editIdentityByAgent");
diff --git a/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java b/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
index e10ea131..f595accf 100644
--- a/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
+++ b/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
@@ -119,9 +119,6 @@ public class BenFamilyMapping {
 	@Transient
 	private Integer blockId;
 
-//	@Transient
-//	private BenFamilyMapping memberList[];
-
 	@Transient
 	private Long beneficiaryRegId;
 
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
index 944e2b70..4be1b4a3 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
@@ -353,12 +353,6 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	@Transient
 	private String stateName;
-//	@Expose
-//	@Transient
-//	private Integer districtId;
-//	@Expose
-//	@Transient
-//	private String districtName;
 	@Expose
 	@Transient
 	private Integer blockId;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
index 78e0da58..1cb6a282 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
@@ -31,7 +31,6 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.gson.annotations.Expose;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
index 6ba6ff7d..5da37b40 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
@@ -30,9 +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 com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/identity/domain/Address.java b/src/main/java/com/iemr/common/identity/domain/Address.java
index d37059de..c37b4507 100644
--- a/src/main/java/com/iemr/common/identity/domain/Address.java
+++ b/src/main/java/com/iemr/common/identity/domain/Address.java
@@ -45,7 +45,6 @@
 	 */
 	private Integer zoneID;
 	private String zoneName;
-	// private Integer parkingPlaceID;
 	private String parkingPlaceName;
 	private Integer servicePointID;
 	private String servicePointName;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
index ebdc65fa..eedd6f38 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
@@ -92,8 +92,6 @@ public class MBeneficiaryAccount {
 	@Column(name = "VehicalNo", length = 30)
 	private String vehicleNo;
 
-	// @Column(name = "ParkingPlaceID")
-	// private Integer parkingPlaceID;
 
 	@Column(name = "SyncedBy", length = 30)
 	private String syncedBy;
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
index b4bbec5a..a762f64d 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
@@ -21,7 +21,6 @@
 */
 package com.iemr.common.identity.domain;
 
-import java.math.BigInteger;
 import java.sql.Timestamp;
 
 import javax.persistence.Column;
@@ -73,8 +72,6 @@ public class MBeneficiaryImage {
 
 	@Column(name = "VehicalNo")
 	private String vehicalNo;
-	// @Column(name = "ParkingPlaceID")
-	// private Integer parkingPlaceID;
 	@Column(name = "SyncedBy")
 	private String syncedBy;
 	@Column(name = "SyncedDate", unique = true, nullable = false)
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
index 6d44d817..f9bd7858 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -41,10 +41,6 @@
 
 import lombok.Data;
 
-/**
- * The persistent class for the m_beneficiarydetails database table.
- * 
- */
 @Entity
 @Table(name = "i_beneficiarydetails")
 @NamedQuery(name = "MBeneficiarydetail.findAll", query = "SELECT m FROM MBeneficiarydetail m order by beneficiaryDetailsId asc")
@@ -62,7 +58,6 @@ public class MBeneficiarydetail implements Serializable {
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(unique = true, nullable = false)
-	// @OrderBy(value = "beneficiaryDetailsId asc")
 	private BigInteger beneficiaryDetailsId;
 
 	private Integer areaId;
@@ -125,8 +120,6 @@ public class MBeneficiarydetail implements Serializable {
 	@Column(length = 50)
 	private String modifiedBy;
 
-	// private Integer parkingPlaceID;
-
 	private Integer occupationId;
 
 	@Column(length = 45)
@@ -238,21 +231,10 @@ public class MBeneficiarydetail implements Serializable {
 	@Column(name = "VanSerialNo", updatable = false)
 	private BigInteger vanSerialNo;
 
-//	@Expose
-//	@Column(name = "familyid", updatable = true)
-//	private String familyid;
-
-	// END OF new column added for data sync
-	/**
-	 * Default constructor
-	 */
 	public MBeneficiarydetail() {
 
 	}
 
-	/**
-	 * Constructor for retrieving partial beneficiary details
-	 */
 	public MBeneficiarydetail(BigInteger beneficiaryDetailsId, String firstName, String lastName, String middleName,
 			String fatherName, String spouseName) {
 
@@ -342,9 +324,4 @@ public static String getIsHIVPositive(Integer status) {
 		return isHIVPositive;
 	}
 
-	// public static void main(String[] args)
-	// {
-	// Timestamp dob = new Timestamp(10, 07, 10,0,0,0,0);
-	// System.out.println(calculateAge(dob));
-	// }
 }
\ No newline at end of file
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 74a42016..510d1d2e 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
@@ -94,11 +94,6 @@ public class MBeneficiaryfamilymapping implements Serializable {
 
 	private Timestamp reservedOn;
 
-	// commented, 28-09-2018
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */)
-//	@JoinColumn(name = "BenMapId", insertable = false, updatable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
 
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
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 60ab2fcc..4323b895 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
@@ -103,12 +103,6 @@ public class MBeneficiaryidentity implements Serializable {
 
 	private Timestamp reservedOn;
 
-	// commented, 28-09-2018, unidirectional
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId", insertable = false, updatable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
-
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
index 078838be..944df5c7 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
@@ -162,18 +162,6 @@ public class MBeneficiarymapping implements Serializable {
 	@JoinColumn(referencedColumnName = "benMapId", name = "benMapId", insertable = false, updatable = false)
 	private List<TBendataaccess> tBendataaccesses;
 
-	// public MBeneficiarymapping(BigInteger benMapId, String firstName)
-	// {
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// }
-
-	// public MBeneficiarymapping()
-	// {
-	//
-	// }
-
 	/*
 	 * New columns added for MMU integration 11-04-2018
 	 */
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
index 56717909..0e15dfcd 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
@@ -80,7 +80,6 @@ public class MBeneficiaryregidmapping implements Serializable {
 	@Column(name = "VehicalNo")
 	private String vehicalNo;
 
-	// private Integer ParkingPlaceID;
 
 	private String syncedBy;
 
@@ -88,24 +87,6 @@ public class MBeneficiaryregidmapping implements Serializable {
 
 	private String reservedForChange;
 
-	// //bi-directional one-to-one association to MBeneficiarydetail
-	// @OneToOne(fetch=FetchType.LAZY)
-	// @JoinColumn(name="BenRegId", referencedColumnName="BeneficiaryRegID",
-	// nullable=false, insertable=false, updatable=false)
-	// private MBeneficiarydetail MBeneficiarydetail;
-	//
-	// //bi-directional one-to-one association to MBeneficiarymapping
-	// @OneToOne(fetch=FetchType.LAZY)
-	// @JoinColumn(name="BenRegId", referencedColumnName="BenRegId", nullable=false,
-	// insertable=false, updatable=false)
-	// private MBeneficiarymapping MBeneficiarymapping;
-	//
-	// //bi-directional many-to-one association to MBeneficiaryfamilymapping
-	// @OneToMany(mappedBy="MBeneficiaryregid")
-	// private List<MBeneficiaryfamilymapping> MBeneficiaryfamilymappings;
-
-	// new column added for data sync
-	// 17-06-2018
 	@Expose
 	@Column(name = "vanID")
 	private Integer vanID;
@@ -117,5 +98,4 @@ public class MBeneficiaryregidmapping implements Serializable {
 	@Column(name = "VanSerialNo")
 	private BigInteger vanSerialNo;
 
-	// END OF new column added for data sync
 }
\ No newline at end of file
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 3d92c90e..aea73035 100644
--- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
+++ b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
@@ -107,10 +107,6 @@ public class MBeneficiaryservicemapping implements Serializable {
 	@Column(length = 45)
 	private String stateName;
 
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId")
-//	private MBeneficiarymapping MBeneficiarymapping;
 	
 	@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 72fb3a23..647bfda4 100644
--- a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
+++ b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
@@ -68,8 +68,6 @@ public class TBendataaccess implements Serializable
 	private String authId;
 
 	@Transient
-	// @Column(nullable=false, length=75) //SQL Error: 1054, SQLState: 42S22 Unknown column 'tbendataac0_.consentId' in
-	// 'field list'
 	private String consentId;
 
 	@Column(length = 4)
@@ -79,8 +77,6 @@ public class TBendataaccess implements Serializable
 	private Integer userAgentId;
 
 	@Transient
-	// @Column(nullable=false, length=20)// SQL Error: 1054, SQLState: 42S22 Unknown column
-	// 'tbendataac0_.userAgentIpAddr' in 'field list'
 	private String userAgentIpAddr;
 
 	@Column(nullable = false)
@@ -92,11 +88,6 @@ public class TBendataaccess implements Serializable
 	@Column(nullable = false)
 	private Integer userAgentServiceId;
 
-	// commented on 28-09-2018
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/*fetch = FetchType.EAGER*/) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId", nullable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
 
diff --git a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java b/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
index 81a8b278..ea615acd 100644
--- a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
+++ b/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
@@ -97,7 +97,6 @@ public class V_BenAdvanceSearch {
 	@Column(name = "DOB")
 	private Timestamp dOB;
 
-	// new column added for D2D, 21-01-2021
 	@Expose
 	@Column(name = "houseoldId")
 	private Long houseHoldID;
@@ -144,7 +143,6 @@ public void setHouseHoldID(Long houseHoldID) {
 
 	public V_BenAdvanceSearch() {
 		super();
-		// TODO Auto-generated constructor stub
 	}
 
 	public BigInteger getBenMapID() {
diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
index a2b84254..456b8030 100644
--- a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
@@ -52,7 +52,6 @@ public class BeneficiariesDTO implements Comparable<BeneficiariesDTO> {
 	private String preferredEmailId; //
 	private BenDetailDTO beneficiaryDetails;
 	private List<BenFamilyDTO> beneficiaryFamilyTags;
-	// private List<BenFamilyDTO> benFamilyDTOs;
 	private List<BenIdentityDTO> beneficiaryIdentites;
 	private List<BenServiceDTO> beneficiaryServiceMap;
 	private List<Phone> contacts;
@@ -65,8 +64,6 @@ public int compareTo(BeneficiariesDTO ben) {
 		return this.benMapId.compareTo(ben.benMapId);
 	}
 
-	// Start Outreach
-	// New columns added for MMU integration 09-04-2018
 	private Timestamp marriageDate;
 	private Integer ageAtMarriage;
 	private String literacyStatus;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
index 38b472a6..590bbfa3 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
@@ -28,7 +28,6 @@
 import com.iemr.common.identity.domain.Address;
 import com.iemr.common.identity.domain.Contact;
 import com.iemr.common.identity.domain.Identity;
-// import com.iemr.common.identity.domain.Phone;
 
 import lombok.Data;
 
@@ -36,7 +35,6 @@
 public class IdentityDTO {
 
 	private String eventTypeName; // created, reserved, registered, modified,
-									// deleted
 	private Timestamp eventTypeDate;
 	private Integer agentId;
 	private String agentName;
@@ -50,7 +48,6 @@ public class IdentityDTO {
 	private String stateName;
 	private Integer providerServiceMapId;
 
-	// details
 	private Integer areaId;
 	private Integer beneficiaryId;
 	private Integer beneficiaryRegId;
@@ -91,7 +88,6 @@ public class IdentityDTO {
 	private String title;
 	private Integer zoneId;
 
-	// address
 	private Address currentAddress;
 	private Address permanentAddress;
 	private Address emergencyAddress;
@@ -101,28 +97,18 @@ public class IdentityDTO {
 	private Boolean isEmerAddrSameAsPermAddr;
 	private String addressType;
 
-	// contacts
 	private String preferredEmailId;
 	private Contact contact;
 
-	// family tagging
 	List<BenFamilyDTO> benFamilyDTOs;
-	// private Boolean isEmergencyContact;
-	// private String relationshipToSelf;
-	// private BigInteger associatedBenRegId;
 
-	// identities
 	private List<Identity> identities;
 
-	// Start 1097
 	private Integer sexualOrientationID;
 	private String sexualOrientationType;
 	private String isHIVPositive;
-	// End 1097
 
-	/*
-	 * New columns added for MMU integration 11-04-2018
-	 */
+	
 	private String bankName;
 	private String branchName;
 	private String ifscCode;
@@ -133,14 +119,10 @@ public class IdentityDTO {
 	private Integer ageAtMarriage;
 	private Integer incomeStatusId;
 	private String incomeStatus;
-	// End
 
-	// new column added for data sync
-	// 17-06-2018
 	@Expose
 	private Integer vanID;
 
-	// END OF new column added for data sync
 
 	@Expose
 	private Boolean beneficiaryConsent;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
index 23634fb8..5efb3c79 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
@@ -65,7 +65,6 @@ public class IdentityEditDTO {
 	private String gender;
 	private Integer titleId;
 	private String title;
-	// private Integer parkingPlaceId;
 	private String literacyStatus;
 
 	// self address
@@ -109,13 +108,6 @@ public class IdentityEditDTO {
 	// family details
 	private Boolean changeInFamilyDetails = false;
 	List<BenFamilyDTO> benFamilyDTOs;
-	// private Boolean isEmergencyContact;
-	// private String relationshipToSelf;
-	// private BigInteger associatedBenRegId; // Family mapping must be a list
-
-	// List<BenFamilyDTO> benFamilyDTOs;
-
-	// MMU/TM details
 	private Boolean changeInAssociations = false;
 
 	private Integer zoneId;
diff --git a/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
index 6506897a..db4bf011 100644
--- a/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
+++ b/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java
@@ -56,7 +56,6 @@ public class IdentitySearchDTO {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Timestamp dob;
 
-	// new column added for D2D, 21-01-2021
 	private Long houseHoldID;
 	private Boolean isD2D;
 
diff --git a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
index 8a67569d..6fee444f 100644
--- a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
+++ b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
@@ -23,6 +23,5 @@
 
 public class SearchCriteriaException {
 	
-	// SUNIL TODO: add the exception & propagate
 
 }
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
index 64df182c..85e47c19 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -298,7 +298,6 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID") })
 	MBeneficiaryservicemapping identityDTOToMBeneficiaryservicemapping(IdentityDTO dto);
 
-	// SUNIL TODO: Change to order of target & source to maintain consistency
 	@Mappings({ @Mapping(target = "benMapId", source = "benMapId"),
 			@Mapping(target = "benId", source = "map.MBeneficiaryregidmapping.beneficiaryID"),
 			@Mapping(target = "benRegId", source = "map.MBeneficiaryregidmapping.benRegId"),
@@ -579,26 +578,12 @@ List<BenFamilyDTO> mapToMBeneficiaryfamilymappingWithBenFamilyDTOList(
 
 	List<BenServiceDTO> mBeneficiaryservicemappingListToBenServiceDTOList(List<MBeneficiaryservicemapping> services);
 
-	// @Mapping(target = "MBeneficiaryservicemappings", expression =
-	// "java(Collections.singletonList(svcMapping))"),
-	// @Mapping(target = "MBeneficiaryfamilymappings", expression =
-	// "java(Collections.singletonList(familyMapping))")
-	// MBeneficiarymapping
-	// MBeneficiarymappingDTOToMBeneficiarymapping(MBeneficiarymappingDTOInbound
-	// dto);
-	// MBeneficiarymappingDTOInbound
-	// MBeneficiarymappingToMBeneficiarymappingDTO(MBeneficiarymapping map);
-
-	// Start outreach
-	// code specific for outreach
 	@Mappings({ @Mapping(source = "dto.bankName", target = "bankName"),
 			@Mapping(source = "dto.branchName", target = "branchName"),
 			@Mapping(source = "dto.ifscCode", target = "ifscCode"),
 			@Mapping(source = "dto.accountNo", target = "accountNo"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
 			@Mapping(source = "dto.eventTypeDate", target = "createdDate"),
-			// new mapping added for data sync(van ID & parking place ID)
-			// 17-09-2018
 			@Mapping(source = "dto.vanID", target = "vanID"),
 			@Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// End
diff --git a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
index 0f287916..b9ba6524 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
@@ -48,10 +48,6 @@ public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigI
 
 	List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String SMSPhoneNum);
 
-//	@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum or phoneNum1 = :phoneNum "
-//			+ "or c.phoneNum2 = :phoneNum or c.phoneNum3 = :phoneNum or c.phoneNum4 = :phoneNum "
-//			+ "or c.phoneNum5 = :phoneNum order by c.benContactsID desc")
-//	List<MBeneficiarycontact> findByAnyPhoneNum(@Param("phoneNum") String phoneNum);
 	
 	@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum ")
 	List<MBeneficiarycontact> findByAnyPhoneNum(@Param("phoneNum") String phoneNum);
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
index 22d6d0cc..24d20829 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java
@@ -40,21 +40,12 @@ public interface BenDataAccessRepo extends CrudRepository<TBendataaccess, BigInt
 	List<TBendataaccess> findByUserAgentIdAndAccessedOnBetweenOrderByAccessIdAsc(Integer userAgentId,
 			Timestamp fromDate, Timestamp toDate);
 
-	// commented as userAgentIpAddr is unknown column
-	// List<TBendataaccess> findByUserAgentIpAddr(String userAgentIpAddr);
-	// List<TBendataaccess> findByUserAgentIpAddrAndAccessedOnBetween(String userAgentIpAddr, Timestamp fromDate,
-	// Timestamp toDate);
-	// List<TBendataaccess> findByUserAgentIdAndUserAgentIpAddr(Integer userAgentId, String userAgentIpAddr);
-	// List<TBendataaccess> findByUserAgentIdAndUserAgentIpAddrAndAccessedOnBetween(Integer userAgentId, String
-	// userAgentIpAddr, Timestamp fromDate, Timestamp toDate);
 
 	List<TBendataaccess> findByUserAgentPSMapIdOrderByAccessIdAsc(Integer userAgentPSMapId);
 
 	List<TBendataaccess> findByUserAgentRoleIdOrderByAccessIdAsc(Integer userAgentRoleId);
 
 	List<TBendataaccess> findByUserAgentServiceIdOrderByAccessIdAsc(Integer userAgentServiceId);
-	// List<TBendataaccess> findByUserAgentStateId(Integer userAgentStateId);
-	// List<TBendataaccess> findByUserAgentServiceProviderId(Integer userAgentServiceProviderId);
 
 	List<TBendataaccess> findByUserAgentPSMapIdAndAccessedOnBetweenOrderByAccessIdAsc(Integer userAgentPSMapId,
 			Timestamp fromDate, Timestamp toDate);
@@ -64,15 +55,8 @@ List<TBendataaccess> findByUserAgentRoleIdAndAccessedOnBetweenOrderByAccessIdAsc
 
 	List<TBendataaccess> findByUserAgentServiceIdAndAccessedOnBetweenOrderByAccessIdAsc(Integer userAgentServiceId,
 			Timestamp fromDate, Timestamp toDate);
-	// List<TBendataaccess> findByUserAgentStateIdAndAccessedOnBetween(Integer userAgentStateId, Timestamp fromDate,
-	// Timestamp toDate);
-	// List<TBendataaccess> findByUserAgentServiceProviderIdAndAccessedOnBetween(Integer userAgentServiceProviderId,
-	// Timestamp fromDate, Timestamp toDate);
 
 	Long countByUserAgentIdAndAccessedOnBetweenOrderByAccessIdAsc(Integer userAgentId, Timestamp fromDate, Timestamp toDate);
-	// Long countByUserAgentIpAddrAndAccessedOnBetween(String userAgentIpAddr, Timestamp fromDate, Timestamp toDate);
-	// Long countByUserAgentIdAndUserAgentIpAddrAndAccessedOnBetween(Integer userAgentId, String userAgentIpAddr,
-	// Timestamp fromDate, Timestamp toDate);
 
 	Long countByUserAgentPSMapId(Integer userAgentPSMapId);
 
@@ -80,17 +64,12 @@ List<TBendataaccess> findByUserAgentServiceIdAndAccessedOnBetweenOrderByAccessId
 
 	Long countByUserAgentServiceId(Integer userAgentServiceId);
 
-	// Long countByUserAgentStateId(Integer userAgentStateId);
-	// Long countByUserAgentServiceProviderId(Integer userAgentServiceProviderId);
 	Long countByUserAgentPSMapIdAndAccessedOnBetween(Integer userAgentPSMapId, Timestamp fromDate, Timestamp toDate);
 
 	Long countByUserAgentRoleIdAndAccessedOnBetween(Integer userAgentRoleId, Timestamp fromDate, Timestamp toDate);
 
 	Long countByUserAgentServiceIdAndAccessedOnBetween(Integer userAgentServiceId, Timestamp fromDate,
 			Timestamp toDate);
-	// Long countByUserAgentStateIdAndAccessedOnBetween(Integer userAgentStateId, Timestamp fromDate, Timestamp toDate);
-	// Long countByUserAgentServiceProviderIdAndAccessedOnBetween(Integer userAgentServiceProviderId, Timestamp
-	// fromDate, Timestamp toDate);
 
 	List<TBendataaccess> findByaccessedOnBetweenOrderByAccessIdAsc(Timestamp fromDate, Timestamp toDate);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
index 8668bce0..af2998cd 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
@@ -42,18 +42,12 @@ public interface BenDetailRepo extends CrudRepository<MBeneficiarydetail, BigInt
 	List<MBeneficiarydetail> findByCreatedDateBetweenOrderByBeneficiaryDetailsIdAsc(Timestamp fromDate,
 			Timestamp toDate);
 
-	// List<MBeneficiarydetail> findByMBeneficiaryregid(MBeneficiaryregidmapping
-	// MBeneficiaryregid);
 	List<MBeneficiarydetail> findByFirstNameAndLastNameOrderByBeneficiaryDetailsIdAsc(String fName, String mName);
 
-	// searching with criterias
 
 	@Query("select d from MBeneficiarydetail d " + "where d.mBeneficiarymapping.benRegId = :benRegId")
 	MBeneficiarydetail findByBenRegId(BigInteger benRegId);
 
-	// @Query("select d from MBeneficiarydetail d "
-	// + "where d.mBeneficiarymapping.beneficiaryID = :beneficiaryID")
-	// MBeneficiarydetail findByBeneficiaryID(BigInteger beneficiaryID);
 
 	@Query("select d from MBeneficiarydetail d where d.firstName = :fName and d.middleName = :mName and "
 			+ "d.lastName = :lName Order By d.beneficiaryDetailsId Asc")
@@ -84,17 +78,12 @@ List<MBeneficiarydetail> findByNameAndSpouseNameAndDob(String fName, String mNam
 	@Query("select new MBeneficiarydetail(d.beneficiaryDetailsId, d.firstName, d.lastName, d.middleName, "
 			+ "d.fatherName, d.spouseName) "
 			+ "from MBeneficiarydetail d where d.mBeneficiarymapping.benRegId = :benRegId")
-	// + "in (select beneficiaryDetailsId from MBeneficiarymapping where benRegId =
-	// :benRegId)")
 	MBeneficiarydetail findPartialBeneficiaryDetailByBenRegId(@Param("benRegId") BigInteger benRegId);
 
 	@Query("select new MBeneficiarydetail(d.beneficiaryDetailsId, d.firstName, d.lastName, d.middleName, "
 			+ "d.fatherName, d.spouseName) "
 			+ "from MBeneficiarydetail d where d.mBeneficiarymapping.benRegId in :benRegIds")
 	List<MBeneficiarydetail> findPartialBeneficiaryDetailByBenRegId(@Param("benRegIds") List<BigInteger> benRegId);
-	// @Query("select d from MBeneficiarydetail d where d.MBeneficiaryregid.benRegId
-	// = :benRegid")
-	// List<MBeneficiarydetail> findByBeneficiaryRegid(BigInteger benRegid);
 
 	@Transactional
 	@Modifying
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
index c77a1b19..ca18a43b 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java
@@ -37,8 +37,7 @@
 import com.iemr.common.identity.domain.MBeneficiarydetail;
 import com.iemr.common.identity.dto.IdentitySearchDTO;
 
-public class BenDetailRepoImpl implements BenDetailRepoCustom
-{
+public class BenDetailRepoImpl implements BenDetailRepoCustom {
 
 	@PersistenceContext
 	private EntityManager entityManager;
@@ -48,19 +47,22 @@ public class BenDetailRepoImpl implements BenDetailRepoCustom
 	/**
 	 * Search Criteria: the following are necessary to conduct a finite search
 	 * 
-	 * 1. beneficiary ID 2. beneficiary Reg ID 3. Contact Number 4. Name (First, Middle, Last), Age, Gender 5. Village
-	 * Name 6. District State Zone Coordinates 7. Pin Code 8. Father Name 9. Spouse Name
+	 * 1. beneficiary ID 2. beneficiary Reg ID 3. Contact Number 4. Name (First,
+	 * Middle, Last), Age, Gender 5. Village Name 6. District State Zone Coordinates
+	 * 7. Pin Code 8. Father Name 9. Spouse Name
 	 * 
-	 * Allowed Single Parameters: - beneficiary Id - beneficiary Reg Id - Contact Number
+	 * Allowed Single Parameters: - beneficiary Id - beneficiary Reg Id - Contact
+	 * Number
 	 * 
-	 * Allowed Multi-Parameters: - Name (First, Middle, Last), Age, Gender - Contact Number & Name (First, Middle, Last)
-	 * - Pin Code & Name (First, Middle, Last) - Village, Father Name & Name (First, Middle, Last) - Village, Spouse
-	 * Name & Name (First, Middle, Last) - Village, District, State - Govt identities(keys, values)
+	 * Allowed Multi-Parameters: - Name (First, Middle, Last), Age, Gender - Contact
+	 * Number & Name (First, Middle, Last) - Pin Code & Name (First, Middle, Last) -
+	 * Village, Father Name & Name (First, Middle, Last) - Village, Spouse Name &
+	 * Name (First, Middle, Last) - Village, District, State - Govt identities(keys,
+	 * values)
 	 */
 
 	@Override
-	public List<MBeneficiarydetail> advanceFilterSearch(IdentitySearchDTO searchDTO)
-	{
+	public List<MBeneficiarydetail> advanceFilterSearch(IdentitySearchDTO searchDTO) {
 
 		CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
 		CriteriaQuery<MBeneficiarydetail> criteriaQuery = criteriaBuilder.createQuery(MBeneficiarydetail.class);
@@ -69,113 +71,80 @@ public List<MBeneficiarydetail> advanceFilterSearch(IdentitySearchDTO searchDTO)
 		// add predicates to see more parameters
 		List<Predicate> predicates = new ArrayList<Predicate>();
 
-		/**
-		 * Beneficiary ID is present, no need for other criteria
-		 */
-		// if(filterDTO.getBeneficiaryId().isPresent()) {
-		// //filterDTO.getBeneficiaryId().get();
-		// MBeneficiaryregidmapping regId = regIdRepo.findByBeneficiaryID(filterDTO.getBeneficiaryId().get());
-		// predicates.add(criteriaBuilder.equal(root.get("beneficiaryRegID"), regId.getBenRegId()));
-		// }
-
-		/**
-		 * Beneficiary Reg ID is present, no need for other criteria
-		 */
-		// if(filterDTO.getBeneficiaryRegId().isPresent()) {
-		// //filterDTO.getBeneficiaryRegId().get();
-		// predicates.add(criteriaBuilder.equal(root.get("beneficiaryRegID"), filterDTO.getBeneficiaryRegId().get()));
-		// }
-
 		/**
 		 * First Name is present, additional criteria needed
 		 */
-		if (searchDTO.getFirstName() != null)
-		{
+		if (searchDTO.getFirstName() != null) {
 
-			predicates.add(criteriaBuilder.like(root.<String> get("firstName"), "%" + searchDTO.getFirstName() + "%"));
+			predicates.add(criteriaBuilder.like(root.<String>get("firstName"), "%" + searchDTO.getFirstName() + "%"));
 		}
 
 		/**
 		 * Middle Name is present, additional criteria needed
 		 */
-		if (searchDTO.getMiddleName() != null)
-		{
-			predicates
-					.add(criteriaBuilder.like(root.<String> get("middleName"), "%" + searchDTO.getMiddleName() + "%"));
+		if (searchDTO.getMiddleName() != null) {
+			predicates.add(criteriaBuilder.like(root.<String>get("middleName"), "%" + searchDTO.getMiddleName() + "%"));
 		}
 
 		/**
 		 * Last Name is present, additional criteria needed
 		 */
-		if (searchDTO.getLastName() != null)
-		{
-			predicates.add(criteriaBuilder.like(root.<String> get("lastName"), "%" + searchDTO.getLastName() + "%"));
+		if (searchDTO.getLastName() != null) {
+			predicates.add(criteriaBuilder.like(root.<String>get("lastName"), "%" + searchDTO.getLastName() + "%"));
 		}
 
 		/**
 		 * Age Id is present, additional criteria needed
 		 */
-		if (searchDTO.getAgeId() != null)
-		{
+		if (searchDTO.getAgeId() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("ageId"), searchDTO.getAgeId()));
 		}
 
 		/**
 		 * Age is present, additional criteria needed
 		 */
-		if (searchDTO.getAge() != null)
-		{
+		if (searchDTO.getAge() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("age"), searchDTO.getAge()));
 		}
 
 		/**
 		 * Gender Id is present, additional criteria needed
 		 */
-		if (searchDTO.getGenderId() != null)
-		{
+		if (searchDTO.getGenderId() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("genderId"), searchDTO.getGenderId()));
 		}
 
 		/**
 		 * Gender Name is present, additional criteria needed
 		 */
-		if (searchDTO.getGenderName() != null)
-		{
+		if (searchDTO.getGenderName() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("genderName"), searchDTO.getGenderName()));
 		}
 
 		/**
 		 * Spouse Name is present, additional criteria needed
 		 */
-		if (searchDTO.getSpouseName() != null)
-		{
-			predicates
-					.add(criteriaBuilder.like(root.<String> get("spouseName"), "%" + searchDTO.getSpouseName() + "%"));
+		if (searchDTO.getSpouseName() != null) {
+			predicates.add(criteriaBuilder.like(root.<String>get("spouseName"), "%" + searchDTO.getSpouseName() + "%"));
 		}
 
 		/**
 		 * Father Name present, additional criteria needed
 		 */
-		if (searchDTO.getFatherName() != null)
-		{
-			predicates
-					.add(criteriaBuilder.like(root.<String> get("fatherName"), "%" + searchDTO.getFatherName() + "%"));
+		if (searchDTO.getFatherName() != null) {
+			predicates.add(criteriaBuilder.like(root.<String>get("fatherName"), "%" + searchDTO.getFatherName() + "%"));
 		}
 
 		/**
 		 * Pin Code is present, additional criteria needed
 		 */
-		if (searchDTO.getPinCode() != null)
-		{
+		if (searchDTO.getPinCode() != null) {
 			predicates.add(criteriaBuilder.equal(root.get("pinCode"), searchDTO.getPinCode()));
 		}
 
 		/**
 		 * Contact Number is present, additional criteria needed
 		 */
-		// if(filterDTO.getContactNumber().isPresent()){
-		// predicates.add(criteriaBuilder.equal(root.get("contactNumber"), filterDTO.getPinCode().get()));
-		// }
 
 		criteriaQuery.select(root).where(predicates.toArray(new Predicate[] {}))
 				.orderBy(criteriaBuilder.asc(root.get("benMapId")));
diff --git a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
index 05b49af4..f4f55096 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java
@@ -27,7 +27,6 @@
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-// import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -39,18 +38,9 @@
 public interface BenFamilyMappingRepo extends CrudRepository<MBeneficiaryfamilymapping, BigInteger> {
 	List<MBeneficiaryfamilymapping> findByBenFamilyMapIdOrderByBenFamilyMapIdAsc(BigInteger benFamilyMapId);
 
-	// List<MBeneficiaryfamilymapping> findByAssociatedBenRegID(BigInteger
-	// associatedBenRegID);
-	// List<MBeneficiaryfamilymapping>
-	// findByAssociatedBenRegIDAndIsEmergencyContact(BigInteger associatedBenRegID,
-	// Boolean isEmergencyContact);
 	List<MBeneficiaryfamilymapping> findByCreatedDateBetweenOrderByBenFamilyMapIdAsc(Timestamp fromDate,
 			Timestamp toDate);
 
-	// @Query("select f from MBeneficiaryfamilymapping f where
-	// f.MBeneficiaryregid.benRegId = :associatedBenID")
-	// List<MBeneficiaryfamilymapping> findByAssociatedBenID(BigInteger
-	// associatedBenID);
 
 	List<MBeneficiaryfamilymapping> findByBenMapIdOrderByBenFamilyMapIdAsc(BigInteger benMapId);
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
index 4d3ae32f..ceaca5de 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
@@ -26,20 +26,14 @@
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-// import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.iemr.common.identity.domain.MBeneficiaryaddress;
-// import com.iemr.common.identity.domain.MBeneficiaryaddress;
-// import com.iemr.common.identity.domain.MBeneficiaryconsent;
 import com.iemr.common.identity.domain.MBeneficiarycontact;
 import com.iemr.common.identity.domain.MBeneficiarydetail;
-// import com.iemr.common.identity.domain.MBeneficiarydetail;
-// import com.iemr.common.identity.domain.MBeneficiaryfamilymapping;
-// import com.iemr.common.identity.domain.MBeneficiaryidentity;
 import com.iemr.common.identity.domain.MBeneficiarymapping;
 import com.iemr.common.identity.domain.MBeneficiaryregidmapping;
 
@@ -54,17 +48,6 @@ public interface BenMappingRepo extends CrudRepository<MBeneficiarymapping, BigI
 	List<MBeneficiarymapping> findByMBeneficiaryregidmappingOrderByBenMapIdAsc(
 			MBeneficiaryregidmapping MBeneficiaryregidmapping);
 
-	// @Query("select m from MBeneficiarymapping m where
-	// m.mBeneficiarycontact.benContactsID = :benContactsID")
-	// MBeneficiarymapping findByBenContactsID(@Param("benContactsID")
-	// BigInteger benContactsID);
-	// List<MBeneficiarymapping>
-	// findByMBeneficiaryregidmapping(MBeneficiaryregidmapping
-	// MBeneficiaryregidmapping);
-	// MBeneficiarymapping findByMBeneficiaryaddress(MBeneficiaryaddress
-	// MBeneficiaryaddress);
-	// List<MBeneficiarymapping> findByMBeneficiarycontact(MBeneficiarycontact
-	// MBeneficiarycontact);
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailOrderByBenMapIdAsc(MBeneficiarydetail mBeneficiarydetail);
 
@@ -91,65 +74,6 @@ List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBene
 	@Query("select t from MBeneficiarymapping t where t.benRegId = :benRegID")
 	MBeneficiarymapping getBenImageIdByBenRegID(@Param("benRegID") BigInteger benRegID);
 
-	// List<MBeneficiarymapping> findByMBeneficiaryconsent(MBeneficiaryconsent
-	// MBeneficiaryconsent);
-
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryRegIdMapping.benRegId = :benRegId")
-	// List<MBeneficiarymapping> findByBeneficiaryRegId(BigInteger benRegId);
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryaddress.benAddressID = :benAddressID")
-	// List<MBeneficiarymapping> findByBeneficiaryAddressId(BigInteger
-	// benAddressID);
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiarycontact.benContactsID = :benContactsID")
-	// List<MBeneficiarymapping> findByBeneficiaryContactId(BigInteger
-	// benContactsID);
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryconsent.benConsentID = :benConsentID")
-	// List<MBeneficiarymapping> findByBeneficiaryConsentId(BigInteger
-	// benConsentID);
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiarydetail.beneficiaryDetailsId =
-	// :beneficiaryDetailsId")
-	// List<MBeneficiarymapping> findByBeneficiaryDetailId(BigInteger
-	// beneficiaryDetailsId);
-	//
-	//
-	// @Query("select m from MBeneficiarymapping m where m.deleted = b'1'")
-	// List<MBeneficiarymapping> findByDeleted();
-	//
-	// @Query("select m from MBeneficiarymapping m where m.reserved = b'1'")
-	// List<MBeneficiarymapping> findByReserved();
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryregidmapping.beneficiaryID = :BeneficiaryID")
-	// List<MBeneficiarymapping> findByBeneficiaryId(BigInteger BeneficiaryID);
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryidentities.MBeneficiaryidentity =
-	// :MBeneficiaryidentity")
-	// List<MBeneficiarymapping> findByMBeneficiaryidentity(MBeneficiaryidentity
-	// MBeneficiaryidentity);
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryfamilymappings.MBeneficiaryfamilymapping =
-	// :MBeneficiaryfamilymapping")
-	// List<MBeneficiarymapping>
-	// findByMBeneficiaryfamilymapping(MBeneficiaryfamilymapping
-	// MBeneficiaryfamilymapping);
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.MBeneficiaryfamilymappings.MBeneficiaryservicemapping =
-	// :MBeneficiaryservicemapping")
-	// List<MBeneficiarymapping>
-	// findByMBeneficiaryservicemapping(MBeneficiaryservicemapping
-	// MBeneficiaryservicemapping);
-	//
-	// @Query("select m from MBeneficiarymapping m where
-	// m.TBendataaccesses.tBendataaccess = :tBendataaccess")
-	// List<MBeneficiarymapping> findByTBendataaccess(TBendataaccess
-	// tBendataaccess);
 
 	@Transactional
 	@Modifying
@@ -162,14 +86,12 @@ List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBene
 			+ " WHERE t.benRegId = :benRegID ORDER BY t.benMapId Desc ")
 	public List<Object[]> getBenMappingByRegID(@Param("benRegID") BigInteger benRegID);
 
-	// old code 1.0
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
 			+ "  WHERE t.benContactsId IN :contactIDList  ORDER BY t.benMapId Desc ")
 	public List<Object[]> getBenMappingByBenContactIdList(@Param("contactIDList") List<BigInteger> contactIDList);
 
-	// new code 1.0
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
@@ -177,7 +99,6 @@ List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBene
 	public List<Object[]> getBenMappingByBenContactIdListNew(@Param("benContactId") BigInteger benContactId,
 			@Param("vanID") Integer vanID);
 
-	// 19-12-2018, neeraj
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
@@ -190,7 +111,6 @@ public List<Object[]> getBenMappingByBenContactIdListNew(@Param("benContactId")
 	@Query("SELECT t.benRegId FROM MBeneficiarymapping t WHERE t.benDetailsId =:benDetailsId AND vanID = :vanID")
 	public BigInteger getBenRegId(@Param("benDetailsId") BigInteger benDetailsId, @Param("vanID") Integer vanID);
 
-	// 12-09-2022
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
@@ -198,7 +118,6 @@ public List<Object[]> getBenMappingByBenContactIdListNew(@Param("benContactId")
 	public List<Object[]> getBenMappingByBenDetailsIds(@Param("benDetailsIds") List<BigInteger> benDetailsIds,
 			@Param("vanID") Integer vanID);
 
-	// 12-09-2022
 	@Query("SELECT t.benMapId, t.benAddressId, t.benConsentId, t.benContactsId, t.benDetailsId, "
 			+ " t.benRegId, t.benImageId, t.benAccountID, t.vanID, t.vanSerialNo, "
 			+ " t.createdBy, t.createdDate FROM MBeneficiarymapping t "
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
index 04a2bc36..ce01b507 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
@@ -339,8 +339,6 @@ public List<MBeneficiarymapping> finiteSearch(IdentityDTO identityDTO) {
 
 			predicates.add(criteriaBuilder.equal(benContact.get("preferredPhoneNum"),
 					identityDTO.getContact().getPreferredPhoneNum()));
-			// predicates.add(criteriaBuilder.or(benContact.get("phoneNum1"),
-			// identityDTO.getContact().getPreferredPhoneNum()));
 		}
 
 		criteriaQuery.select(root).where(predicates.toArray(new Predicate[] {}));
diff --git a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
index 55683eb4..830b0f41 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
@@ -41,8 +41,6 @@ public interface BenRegIdMappingRepo extends CrudRepository<MBeneficiaryregidmap
 
 	MBeneficiaryregidmapping findByBeneficiaryID(BigInteger beneficiaryID);
 
-	// List<MBeneficiaryregidmapping> findByMBeneficiarydetail(MBeneficiarydetail
-	// MBeneficiarydetail);
 	List<MBeneficiaryregidmapping> findByCreatedDateBetweenOrderByBenRegIdAsc(Timestamp fromDate, Timestamp toDate);
 
 	MBeneficiaryregidmapping findFirstByProvisionedAndReserved(Boolean isProvisioned, Boolean isReserved);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 238ccda5..9ec2a197 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -63,3 +63,5 @@ getHealthID=healthID/getBenhealthID
 
 
 
+
+
