diff --git a/packages/esm-billing-app/src/billing-dashboard/clock-out-strip.component.tsx b/packages/esm-billing-app/src/billing-dashboard/clock-out-strip.component.tsx
index efd4b42b5..7721fa48d 100644
--- a/packages/esm-billing-app/src/billing-dashboard/clock-out-strip.component.tsx
+++ b/packages/esm-billing-app/src/billing-dashboard/clock-out-strip.component.tsx
@@ -32,7 +32,9 @@ export const ClockOutStrip = () => {
       <div className={styles.clockOutInfo}>
         <Alarm />
         <p className={styles.clockInTime}>
-          {t('clockInTime', `Clocked in on ${dayjs(globalActiveSheet.clockIn).format('D MMM YYYY, HH:mm A')}`)}
+          {t('clockInTime', `Clocked in on {{clockInDateTime}}`, {
+            clockInDateTime: dayjs(globalActiveSheet.clockIn).format('D MMM YYYY, HH:mm A'),
+          })}
         </p>
         <span className={styles.middot}>&middot;</span>
         <p className={styles.cashPointName}>{globalActiveSheet.cashPoint.name}</p>
diff --git a/packages/esm-billing-app/translations/en.json b/packages/esm-billing-app/translations/en.json
index 392a2691a..718da5bcf 100644
--- a/packages/esm-billing-app/translations/en.json
+++ b/packages/esm-billing-app/translations/en.json
@@ -12,8 +12,6 @@
   "allPaymentModes": "All Payment Modes",
   "amount": "Amount",
   "anErrorOccurred": "An Error Occurred",
-  "anErrorOccurredClockingIn": "",
-  "anErrorOccurredClockingOut": "An error occurred clocking out",
   "anErrorOccurredCreatingPaymentPoint": "An error occurred creating payment point",
   "approvedTotal": "Approved Total",
   "attributeDescription": "Attribute description",
@@ -72,10 +70,7 @@
   "claimSummary": "Claim Summary",
   "clear": "Clear",
   "clearSearch": "Clear search input",
-  "clockIn": "Clock In",
-  "clockingIn": "Clocking in",
-  "clockingOut": "Clocking Out",
-  "clockOut": "Clock Out",
+  "clockInTime": "Clocked in on {{clockInDateTime}}",
   "close": "Close",
   "create": "Create",
   "createClaimError": "Create Claim error",
@@ -210,7 +205,6 @@
   "paymentModes": "Payment Modes",
   "paymentModeSummary": "Payment Mode Summary",
   "paymentPayment": "Bill Payment",
-  "paymentPoint": "Payment point",
   "paymentPoints": "Payment Points",
   "payments": "Payments",
   "paymentType": "Payment Type",
@@ -218,7 +212,6 @@
   "pendingVerificationReason": "",
   "Phone Number": "Phone Number",
   "pickLabRequest": "Pick Lab Request",
-  "pleaseSelectPaymentPoint": "Please select a payment point",
   "policyNumber": "Policy number",
   "preAuthJustification": "Pre-Auth Justification",
   "preauthRequest": "Preauth requests",
@@ -275,8 +268,6 @@
   "selectitemstorequestforpreauth": "Select items that are to be included in the pre authorization request",
   "selectPaymentMethod": "Select payment method",
   "selectPaymentMode": "Select payment mode",
-  "selectPaymentPoint": "Select payment point",
-  "selectPaymentPointMessage": "Select the payment point on which you will be clocked in.",
   "selectTimesheet": "Select timesheet",
   "sendClaim": "Pre authorization request sent successfully",
   "sendClaimError": "Pre authorization request failed, please try later",
@@ -292,8 +283,6 @@
   "stockItem": "Stock Item",
   "stockItemError": "Stock Item",
   "success": "Success",
-  "successfullyClockedIn": "",
-  "successfullyClockedOut": "Successfully Clocked Out",
   "successfullyCreatedPaymentPoint": "Successfully created payment point",
   "timesheet": "Timesheet",
   "total": "Total",
diff --git a/packages/esm-care-panel-app/src/iit-risk-score/iit-risk-score.component.tsx b/packages/esm-care-panel-app/src/iit-risk-score/iit-risk-score.component.tsx
index 91ae614df..94866c471 100644
--- a/packages/esm-care-panel-app/src/iit-risk-score/iit-risk-score.component.tsx
+++ b/packages/esm-care-panel-app/src/iit-risk-score/iit-risk-score.component.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import usePatientIITScore from '../hooks/usePatientIITScore';
 import styles from './iit-risk-score.scss';
+import dayjs from 'dayjs';
 
 interface CarePanellIITRiskScoreProps {
   patientUuid: string;
@@ -40,6 +41,10 @@ const CarePanellIITRiskScore: React.FC<CarePanellIITRiskScoreProps> = ({ patient
     );
   }
 
+  const evaluationDate = dayjs(riskScore?.evaluationDate).isValid()
+    ? formatDate(parseDate(riskScore.evaluationDate))
+    : '--';
+
   if (error) {
     return <ErrorState error={error} headerTitle={t('iitRiscScore', 'IIT Risk Score')} />;
   }
@@ -53,7 +58,7 @@ const CarePanellIITRiskScore: React.FC<CarePanellIITRiskScoreProps> = ({ patient
         </Column>
         <Column lg={4} md={4} sm={4} className={styles.riskScoreCardItem}>
           <strong>{t('evaluationDate', 'Evaluation Date')}:</strong>
-          <p>{formatDate(parseDate(riskScore?.evaluationDate))}</p>
+          <p>{evaluationDate}</p>
         </Column>
       </Row>
       <Row style={{ display: 'flex' }}>