diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx
index feb718015c5..febfaa193a7 100644
--- a/src/Components/Facility/FacilityHome.tsx
+++ b/src/Components/Facility/FacilityHome.tsx
@@ -116,11 +116,11 @@ export const FacilityHome = (props: any) => {
         <td className="border px-4 py-2 text-center">{data.num_patient_referred || "-"}</td>
         <td className="border px-4 py-2">
           <Button
-              className="py-2 mt-2 px-6 bg-white rounded-md border border-grey-500 inline-flex items-center justify-center whitespace-no-wrap text-sm font-semibold rounded cursor-pointer hover:bg-gray-300"
-              onClick={() =>
-            navigate(`/facility/${facilityId}/triage/${data.id}`)
-        }>
-          Edit
+            className="py-2 mt-2 px-6 bg-white rounded-md border border-grey-500 inline-flex items-center justify-center whitespace-no-wrap text-sm font-semibold rounded cursor-pointer hover:bg-gray-300"
+            onClick={() =>
+              navigate(`/facility/${facilityId}/triage/${data.id}`)
+            }>
+            Edit
         </Button></td>
       </tr>
     );
@@ -155,7 +155,7 @@ export const FacilityHome = (props: any) => {
             </Grid>
             <Grid item xs={12} md={5}>
               <Grid container spacing={1} direction="column">
-                <Grid item xs={12} className="w3-center">
+                <Grid item xs={12}>
                   <Button
                     fullWidth
                     variant="contained"
@@ -166,7 +166,7 @@ export const FacilityHome = (props: any) => {
                     Update Facility
                   </Button>
                 </Grid>
-                <Grid item xs={12} className="w3-center">
+                <Grid item xs={12}>
                   <Button
                     fullWidth
                     variant="contained"
@@ -178,7 +178,7 @@ export const FacilityHome = (props: any) => {
                     Add More Bed Types
                   </Button>
                 </Grid>
-                <Grid item xs={12} className="w3-center">
+                <Grid item xs={12}>
                   <Button
                     fullWidth
                     variant="contained"
@@ -192,7 +192,7 @@ export const FacilityHome = (props: any) => {
                     Add More Doctor Types
                   </Button>
                 </Grid>
-                <Grid item xs={12} className="w3-center">
+                <Grid item xs={12}>
                   <Button
                     fullWidth
                     variant="contained"
@@ -203,7 +203,7 @@ export const FacilityHome = (props: any) => {
                     Add Triage
                   </Button>
                 </Grid>
-                <Grid item xs={12} className="w3-center">
+                <Grid item xs={12}>
                   <Button
                     fullWidth
                     variant="contained"
@@ -218,7 +218,7 @@ export const FacilityHome = (props: any) => {
             </Grid>
           </Grid>
           <Grid container style={{ padding: "10px" }} spacing={1}>
-            <Grid item xs={12} md={6} className="w3-center">
+            <Grid item xs={12} md={6}>
               <Button
                 fullWidth
                 variant="contained"
@@ -229,7 +229,7 @@ export const FacilityHome = (props: any) => {
                 Add Details of Covid Suspects
               </Button>
             </Grid>
-            <Grid item xs={12} md={6} className="w3-center">
+            <Grid item xs={12} md={6}>
               <Button
                 fullWidth
                 variant="contained"
diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index 56173f95716..5d5b2c36121 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -425,7 +425,7 @@ export const PatientHome = (props: any) => {
               </div>
             </div>
           ) : (
-              <span className="w3-center">
+              <span className="flex items-center justify-center">
                 <h6 className="text-gray-700">No Medical History so far</h6>
               </span>
             )}
diff --git a/src/Components/Patient/TeleConsultation.tsx b/src/Components/Patient/TeleConsultation.tsx
deleted file mode 100644
index f328b8dbfd0..00000000000
--- a/src/Components/Patient/TeleConsultation.tsx
+++ /dev/null
@@ -1,298 +0,0 @@
-import { Box, Button, Card, CardActions, CardContent, CardHeader, Checkbox, Grid, Typography } from "@material-ui/core";
-import { makeStyles, Theme } from '@material-ui/core/styles';
-import React, { useState } from "react";
-import { useDispatch } from "react-redux";
-import { TextInputField } from "../Common/HelperInputFields";
-const isEmpty = require('lodash.isempty');
-
-const useStyles = makeStyles((theme: Theme) => ({
-    formTop: {
-        marginTop: '80px',
-        marginBottom: "70px"
-    },
-    formControl: {
-        margin: theme.spacing(1)
-    },
-    selectLabel: {
-        background: 'white',
-        padding: '2px 10px'
-    },
-    checkBoxLabel: {
-        marginLeft: '8px'
-    },
-}));
-
-
-export const TeleConsultation = () => {
-    const classes = useStyles();
-    const dispatch: any = useDispatch();
-    const inputLabel = React.useRef<HTMLLabelElement>(null);
-
-    const initForm: any = {
-        fever: false,
-        feverDuration:"",
-        soreThroat:false,
-        soreThroatDuration:"",
-        cough: false,
-        coughDuration:"",
-        breathlessness: false,
-        breathlessnessDuration: "",
-        otherSymptoms: false,
-        otherSymptomsDetails: "",
-        reasonForCall:""
-        
-    };
-    const initErr: any = {};
-    const [form, setForm] = useState(initForm);
-    const [errors, setErrors] = useState(initErr);
-
-    const validateForm = () => {
-        const err: any = {};
-        Object.keys(form).forEach(key => {
-            const value = form[key];
-            switch (key) {
-                case "feverDuration":
-                    if (form.fever && !value) {
-                        err[key] = "please fill the duration";
-                    }
-                    break;
-                case "soreThroatDuration":
-                    if (form.soreThroat && !value) {
-                        err[key] = "please fill the duration";
-                    }
-                    break;
-                case "coughDuration":
-                    if (form.cough && !value) {
-                        err[key] = "please fill the duration";
-                    }
-                    break;
-                case "breathlessnessDuration":
-                    if (form.breathlessness && !value) {
-                        err[key] = "please fill the duration";
-                    }
-                    break;
-                case "otherSymptomsDetails":
-                    if (form.otherSymptoms && !value) {
-                        err[key] = "please fill the details";
-                    }
-                    break;
-                default:
-                    break;
-            }
-        });
-        if (!isEmpty(err)) {
-            setErrors(err);
-            return false;
-        }
-        setErrors({});
-        return true;
-    };
-
-    const handleSubmit = (e: any) => {
-        e.preventDefault()
-        const validForm = validateForm();
-        if (validForm) {
-            console.log('form', form);
-        }
-    }
-
-    const handleChange = (e: any) => {
-        const { name, value } = e.target;
-        const formValues = { ...form };
-        const errorField = Object.assign({}, errors);
-        if (errorField[name]) {
-            errorField[name] = null;
-            setErrors(errorField);
-        }
-        formValues[name] = value;
-        setForm(formValues)
-    }
-    const handleCheckboxFieldChange = (e: any) => {
-        const { checked, name } = e.target;
-        const fieldValue = Object.assign({}, form);
-        fieldValue[name] = checked;
-        setForm(fieldValue);
-    };
-
-    return <div className={classes.formTop} >
-
-        <Grid container justify="center">
-            <Grid item xs={12} sm={5} md={4} lg={3}>
-
-                <Card>
-                    <CardHeader title="Patient Tele Consultation" />
-
-                    <form onSubmit={(e) => handleSubmit(e)}>
-                        <CardContent>
-                            <Box display="flex" flexDirection="column">
-                                <Typography>
-                                    Symptoms (Yes / No) and Duration (in days)
-                                </Typography>
-                                <Box display="flex" flexDirection="row" justifyItems="flex-start"
-                                    alignItems="center">
-                                    <Checkbox
-                                        checked={form.fever}
-                                        onChange={handleCheckboxFieldChange}
-                                        name="fever"
-                                    />
-                                    <Typography className={classes.checkBoxLabel}>
-                                        Fever
-                                    </Typography>
-                                </Box>
-
-                                {form.fever && <TextInputField
-                                    fullWidth
-                                    name="feverDuration"
-                                    label="Fever Duration"
-                                    placeholder=""
-                                    variant="outlined"
-                                    margin="dense"
-                                    InputLabelProps={{ shrink: !!form.feverDuration }}
-                                    value={form.feverDuration}
-                                    onChange={handleChange}
-                                    errors={errors.feverDuration}
-                                />}
-                                <Box display="flex" flexDirection="row" justifyItems="flex-start"
-                                    alignItems="center">
-                                    <Checkbox
-                                        checked={form.soreThroat}
-                                        onChange={handleCheckboxFieldChange}
-                                        name="soreThroat"
-                                    />
-                                    <Typography className={classes.checkBoxLabel}>
-                                        Sore Throat
-                                    </Typography>
-                                </Box>
-
-                                {form.soreThroat && <TextInputField
-                                    fullWidth
-                                    name="soreThroatDuration"
-                                    label="Sore Throat Duration"
-                                    placeholder=""
-                                    variant="outlined"
-                                    margin="dense"
-                                    InputLabelProps={{ shrink: !!form.soreThroatDuration }}
-                                    value={form.soreThroatDuration}
-                                    onChange={handleChange}
-                                    errors={errors.soreThroatDuration}
-                                />}
-
-                                <Box display="flex" flexDirection="row" justifyItems="flex-start"
-                                    alignItems="center">
-                                    <Checkbox
-                                        checked={form.cough}
-                                        onChange={handleCheckboxFieldChange}
-                                        name="cough"
-                                    />
-                                    <Typography className={classes.checkBoxLabel}>
-                                        Cough
-                                    </Typography>
-                                </Box>
-
-                                {form.cough && <TextInputField
-                                    fullWidth
-                                    name="coughDuration"
-                                    label="Cough Duration"
-                                    placeholder=""
-                                    variant="outlined"
-                                    margin="dense"
-                                    InputLabelProps={{ shrink: !!form.coughDuration }}
-                                    value={form.coughDuration}
-                                    onChange={handleChange}
-                                    errors={errors.coughDuration}
-                                />}
-
-                                <Box display="flex" flexDirection="row" justifyItems="flex-start"
-                                    alignItems="center">
-                                    <Checkbox
-                                        checked={form.breathlessness}
-                                        onChange={handleCheckboxFieldChange}
-                                        name="breathlessness"
-                                    />
-                                    <Typography className={classes.checkBoxLabel}>
-                                        Breathlessness
-                                    </Typography>
-                                </Box>
-
-                                {form.breathlessness && <TextInputField
-                                    fullWidth
-                                    name="breathlessnessDuration"
-                                    label="Breathlessness Duration"
-                                    placeholder=""
-                                    variant="outlined"
-                                    margin="dense"
-                                    InputLabelProps={{ shrink: !!form.breathlessnessDuration }}
-                                    value={form.breathlessnessDuration}
-                                    onChange={handleChange}
-                                    errors={errors.breathlessnessDuration}
-                                />}
-                                <Typography>
-                                    Any other symptoms?
-                                </Typography>
-                                <Box display="flex" flexDirection="row" justifyItems="flex-start"
-                                    alignItems="center">
-                                    <Checkbox
-                                        checked={form.otherSymptoms}
-                                        onChange={handleCheckboxFieldChange}
-                                        name="otherSymptoms"
-                                    />
-                                    <Typography className={classes.checkBoxLabel}>
-                                        Other symptoms
-                                    </Typography>
-                                </Box>
-
-                                {form.otherSymptoms && <TextInputField
-                                    fullWidth
-                                    multiline={true}
-                                    rows={4}
-                                    name="otherSymptomsDetails"
-                                    label="Other Symptoms"
-                                    placeholder=""
-                                    variant="outlined"
-                                    margin="dense"
-                                    InputLabelProps={{ shrink: !!form.otherSymptomsDetails }}
-                                    value={form.otherSymptomsDetails}
-                                    onChange={handleChange}
-                                    errors={errors.otherSymptomsDetails}
-                                />}
-
-                                <Typography>
-                                    Reason for calling
-                                </Typography>
-                                <TextInputField
-                                    fullWidth
-                                    multiline={true}
-                                    rows={4}
-                                    name="reasonForCall"
-                                    label="Reason"
-                                    placeholder=""
-                                    variant="outlined"
-                                    margin="dense"
-                                    InputLabelProps={{ shrink: !!form.reasonForCall }}
-                                    value={form.reasonForCall}
-                                    onChange={handleChange}
-                                    errors={errors.reasonForCall}
-                                />
-
-                            </Box>
-
-                        </CardContent>
-
-                        <CardActions className="padding16">
-                            <Button
-                                color="primary"
-                                variant="contained"
-                                type="submit"
-                                style={{ marginLeft: 'auto' }}
-                                onClick={(e) => handleSubmit(e)}
-                            >
-                                Submit
-                            </Button>
-                        </CardActions>
-                    </form>
-                </Card>
-
-            </Grid>
-        </Grid>
-    </div>
-}
diff --git a/src/Components/Patient/TreatmentForm.tsx b/src/Components/Patient/TreatmentForm.tsx
deleted file mode 100644
index 36e8dd7ecc7..00000000000
--- a/src/Components/Patient/TreatmentForm.tsx
+++ /dev/null
@@ -1,252 +0,0 @@
-import React, { useState } from "react"
-import { makeStyles, Theme } from '@material-ui/core/styles';
-import { useDispatch } from "react-redux";
-import { Box, Grid, Checkbox, Card, CardHeader, CardContent, CardActions, Button, FormControl, InputLabel, Select, MenuItem, Typography, FormLabel, RadioGroup, Radio, FormControlLabel } from "@material-ui/core";
-import { TextInputField, TimeInputField } from "../Common/HelperInputFields";
-// import {  } from "../../Redux/actions";
-const isEmpty = require('lodash.isempty');
-
-
-const useStyles = makeStyles((theme: Theme) => ({
-    formTop: {
-        marginTop: '80px',
-        marginBottom: "70px"
-    },
-    formControl: {
-        margin: theme.spacing(1)
-    },
-    selectLabel: {
-        background: 'white',
-        padding: '2px 10px'
-    },
-    checkBoxLabel: {
-        marginLeft: '8px'
-    },
-}));
-
-
-export const TreatmentForm = (props: any) => {
-    const classes = useStyles();
-    const dispatch: any = useDispatch();
-    const inputLabel = React.useRef<HTMLLabelElement>(null);
-    const [selectedDate, setSelectedDate] = useState(new Date());
-
-    const initForm: any = {
-        patientExamDetails: "",
-        physicalExamSigns: "",
-        medicationAlready: "",
-        medProvidedAtCenter: "",
-        otherDetails: "",
-        temperature: "",
-        time: selectedDate
-    };
-    const initErr: any = {};
-    const [form, setForm] = useState(initForm);
-    const [errors, setErrors] = useState(initErr);
-
-    const validateForm = () => {
-        const err: any = {};
-        Object.keys(form).forEach(key => {
-            const value = form[key];
-            switch (key) {
-                case "patientExamDetails":
-                    if (!value) {
-                        err[key] = "please fill the details";
-                    }
-                    break;
-                case "physicalExamSigns":
-                    if (!value) {
-                        err[key] = "please fill the details";
-                    }
-                    break;
-                case "medicationAlready":
-                    if (!value) {
-                        err[key] = "please fill the details";
-                    }
-                    break;
-                case "medProvidedAtCenter":
-                    if (!value) {
-                        err[key] = "please fill the details";
-                    }
-                    break;
-                case "temperature":
-                    if (!value) {
-                        err[key] = "please fill the temperature";
-                    }
-                    break;
-                default:
-                    break;
-            }
-        });
-        if (!isEmpty(err)) {
-            setErrors(err);
-            return false;
-        }
-        setErrors({});
-        return true;
-    };
-
-    const handleSubmit = (e: any) => {
-        e.preventDefault()
-        const validForm = validateForm();
-        if (validForm) {
-            console.log('form', form);
-        }
-    }
-
-    const handleChange = (e: any) => {
-        const { name, value } = e.target;
-        const formValues = { ...form };
-        const errorField = Object.assign({}, errors);
-        if (errorField[name]) {
-            errorField[name] = null;
-            setErrors(errorField);
-        }
-        formValues[name] = value;
-        setForm(formValues)
-    }
-
-    const handleTimeFieldChange = (date: any) => {
-        const formValues = { ...form };
-        formValues['time'] = date;
-        setSelectedDate(date);
-        setForm(formValues);
-    };
-
-    return <div>
-
-        <Grid container alignContent="center" justify="center">
-            <Grid item xs={12} sm={10} md={8} lg={6} xl={4}>
-
-                <Card style={{ marginTop: '20px' }}>
-                    <CardHeader title="Patient Treatment/Diagnostic" />
-
-                    <form onSubmit={(e) => handleSubmit(e)}>
-                        <CardContent>
-                            <TextInputField
-                                fullWidth
-                                multiline={true}
-                                rows={4}
-                                name="patientExamDetails"
-                                label="Patient Examination Details"
-                                placeholder=""
-                                variant="outlined"
-                                margin="dense"
-                                InputLabelProps={{ shrink: !!form.patientExamDetails }}
-                                value={form.patientExamDetails}
-                                onChange={handleChange}
-                                errors={errors.patientExamDetails}
-                            />
-                        </CardContent>
-                        <CardContent>
-                            <Typography>
-                                Patient Daily Progress
-                            </Typography>
-                            <Grid container justify="space-between" alignItems="center" spacing={1}>
-                                <Grid item xs={6}>
-                                    <TextInputField
-                                        type="number"
-                                        name="temperature"
-                                        label="Temperature"
-                                        placeholder=""
-                                        variant="outlined"
-                                        margin="dense"
-                                        value={form.temperature}
-                                        onChange={handleChange}
-                                        errors={errors.temperature}
-                                    />
-                                </Grid>
-                                <Grid item xs={6}>
-                                    <TimeInputField
-                                        label="Time"
-                                        value={form.time}
-                                        onChange={handleTimeFieldChange}
-                                    />
-                                </Grid>
-                            </Grid>
-                        </CardContent>
-                        <CardContent>
-                            <TextInputField
-                                fullWidth
-                                multiline={true}
-                                rows={4}
-                                name="physicalExamSigns"
-                                label="Physical Examination Signs"
-                                placeholder=""
-                                variant="outlined"
-                                margin="dense"
-                                InputLabelProps={{ shrink: !!form.physicalExamSigns }}
-                                value={form.physicalExamSigns}
-                                onChange={handleChange}
-                                errors={errors.physicalExamSigns}
-                            />
-                        </CardContent>
-                        <CardContent>
-                            <TextInputField
-                                fullWidth
-                                multiline={true}
-                                rows={4}
-                                name="otherDetails"
-                                label="Any Other Details"
-                                placeholder=""
-                                variant="outlined"
-                                margin="dense"
-                                InputLabelProps={{ shrink: !!form.otherDetails }}
-                                value={form.otherDetails}
-                                onChange={handleChange}
-                                errors={errors.otherDetails}
-                            />
-                        </CardContent>
-                        <CardContent>
-                            <Typography>
-                                Patient Medication
-                                </Typography>
-
-                            <TextInputField
-                                fullWidth
-                                multiline={true}
-                                rows={4}
-                                name="medicationAlready"
-                                label="Medication Already Taking"
-                                placeholder="Medication that the patient is already taking"
-                                variant="outlined"
-                                margin="dense"
-                                InputLabelProps={{ shrink: !!form.medicationAlready }}
-                                value={form.medicationAlready}
-                                onChange={handleChange}
-                                errors={errors.medicationAlready}
-                            />
-                        </CardContent>
-                        <CardContent>
-                            <TextInputField
-                                fullWidth
-                                multiline={true}
-                                rows={4}
-                                name="medProvidedAtCenter"
-                                label="Medication Provided at Center/Hospital"
-                                placeholder="Medication being provided at Center/Hospital"
-                                variant="outlined"
-                                margin="dense"
-                                InputLabelProps={{ shrink: !!form.medProvidedAtCenter }}
-                                value={form.medProvidedAtCenter}
-                                onChange={handleChange}
-                                errors={errors.medProvidedAtCenter}
-                            />
-                        </CardContent>
-
-                        <CardActions className="padding16 w3-right">
-                            <Button
-                                color="primary"
-                                variant="contained"
-                                type="submit"
-                                onClick={(e) => handleSubmit(e)}
-                            >
-                                Submit
-                                </Button>
-                        </CardActions>
-                    </form>
-                </Card>
-            </Grid>
-        </Grid>
-    </div>
-}
diff --git a/src/Router/AppRouter.tsx b/src/Router/AppRouter.tsx
index bc1d9b2ce98..5c781b33658 100644
--- a/src/Router/AppRouter.tsx
+++ b/src/Router/AppRouter.tsx
@@ -1,4 +1,4 @@
-import { useRedirect, useRoutes , navigate, usePath } from "hookrouter";
+import { useRedirect, useRoutes, navigate, usePath } from "hookrouter";
 import React, { useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { BedCapacityForm } from "../Components/Facility/BedCapacityForm";
@@ -19,8 +19,6 @@ import { SampleDetails } from "../Components/Patient/SampleDetails";
 import SampleReport from "../Components/Patient/SamplePreview";
 import { SampleTest } from "../Components/Patient/SampleTest";
 import SampleViewAdmin from "../Components/Patient/SampleViewAdmin";
-import { TeleConsultation } from "../Components/Patient/TeleConsultation";
-import { TreatmentForm } from "../Components/Patient/TreatmentForm";
 import ManageUsers from "../Components/Users/ManageUsers";
 import { UserAdd } from "../Components/Users/UserAdd";
 import InventoryList from "../Components/Facility/InventoryList";
@@ -42,9 +40,7 @@ const routes = {
   "/user/add": () => <UserAdd />,
   "/patients": () => <PatientManager />,
   "/patient/:id": ({ id }: any) => <PatientHome id={id} />,
-  "/patient/tele-consult": () => <TeleConsultation />,
   "/patient/discharge": () => <PatientDischarge />,
-  "/patient/treatment": () => <TreatmentForm />,
   "/sample": () => <SampleViewAdmin />,
   "/sample/:id": ({ id }: any) => <SampleDetails id={id} />,
   '/sample/report/:patientId': ({ patientId }: any) => <SampleReport id={patientId} />,
@@ -83,9 +79,6 @@ const routes = {
   "/facility/:facilityId/patient/:patientId/sample/:id": ({ id }: any) => (
     <SampleDetails id={id} />
   ),
-  "/facility/:facilityId/patient/:id/treatment": ({ facilityId, id }: any) => (
-    <TreatmentForm facilityId={facilityId} id={id} />
-  ),
   "/facility/:facilityId/triage/:id": ({ facilityId, id }: any) => (
     <TriageForm facilityId={facilityId} id={id} />
   ),
diff --git a/src/index.html b/src/index.html
index b34b4ad7e52..215608dc42e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -30,8 +30,6 @@
   <link rel="shortcut icon" href="https://cdn.coronasafe.network/care-manifest/images/icons/favicon.ico" type="image/x-icon">
   <link rel="icon" href="https://cdn.coronasafe.network/care-manifest/images/icons/favicon.ico" type="image/x-icon">
   <link rel="manifest" href="/manifest.webmanifest" crossorigin="use-credentials">
-  <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
-
 </head>
 
 <body>