diff --git a/.run/Docker Image Pull.run.xml b/.run/Docker Image Pull.run.xml
deleted file mode 100644
index 9b22d4d..0000000
--- a/.run/Docker Image Pull.run.xml	
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker Image Pull" type="docker-deploy" factoryName="docker-image" server-name="Docker">
-    <deployment type="docker-image">
-      <settings>
-        <option name="imageTag" value="xeroxisxs/eduquest-frontend-nextjs:latest" />
-        <option name="containerName" value="" />
-        <option name="commandLineOptions" value="--platform linux/amd64" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 105ee4d..596d2c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,93 +1,4 @@
-## Stage 1: Build the Next.js app
-#FROM node:20-alpine AS build
-#
-#WORKDIR /app
-#
-## Install dependencies
-#COPY package.json package-lock.json ./
-#RUN npm install
-#
-## Copy all files and build the project
-#COPY . .
-#
-##ARG NEXT_PUBLIC_SITE_URL
-##ARG NEXT_PUBLIC_AZURE_CLIENT_ID
-##ARG NEXT_PUBLIC_AZURE_REDIRECT_URI
-##ARG NEXT_PUBLIC_BACKEND_URL
-##ARG NEXT_PUBLIC_MICROSERVICE_URL
-##ARG NEXT_PUBLIC_LOGIN_REQUEST_SCOPE
-##
-##ENV NEXT_PUBLIC_SITE_URL=$NEXT_PUBLIC_SITE_URL \
-##    NEXT_PUBLIC_AZURE_CLIENT_ID=$NEXT_PUBLIC_AZURE_CLIENT_ID \
-##    NEXT_PUBLIC_AZURE_REDIRECT_URI=$NEXT_PUBLIC_AZURE_REDIRECT_URI \
-##    NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL \
-##    NEXT_PUBLIC_MICROSERVICE_URL=$NEXT_PUBLIC_MICROSERVICE_URL \
-##    NEXT_PUBLIC_LOGIN_REQUEST_SCOPE=$NEXT_PUBLIC_LOGIN_REQUEST_SCOPE
-#
-## Temporary set the env variables and Build the project
-#RUN npm run build
-## Stage 2: Run the Next.js app
-#FROM node:20-alpine
-#
-#WORKDIR /app
-#
-## Install necessary dependencies
-#RUN apk add --no-cache libc6-compat
-#
-## Copy the built files from the previous stage
-#COPY --from=build /app ./
-#
-## Expose the port the app runs on
-#EXPOSE 80
-#
-##COPY --chown=nextjs:nodejs entrypoint.sh /entrypoint.sh
-##RUN chmod +x /entrypoint.sh
-##ENTRYPOINT ["/entrypoint.sh"]
-#
-## Start the Next.js app
-#CMD ["npm", "start"]
-
-
-
-## Stage 1: Build the Next.js app
-#FROM node:20-alpine AS build
-#
-#WORKDIR /app
-#
-## Install dependencies
-#COPY package.json package-lock.json ./
-#RUN npm install
-#
-## Copy all files and build the project
-#COPY . .
-#
-## Temporary set the env variables and Build the project
-#RUN NEXT_PUBLIC_AZURE_CLIENT_ID=PLACEHOLDER_NEXT_PUBLIC_AZURE_CLIENT_ID NEXT_PUBLIC_AZURE_REDIRECT_URI=PLACEHOLDER_NEXT_PUBLIC_AZURE_REDIRECT_URI NEXT_PUBLIC_SITE_URL=PLACEHOLDER_NEXT_PUBLIC_SITE_URL NEXT_PUBLIC_BACKEND_URL=PLACEHOLDER_NEXT_PUBLIC_BACKEND_URL NEXT_PUBLIC_MICROSERVICE_URL=PLACEHOLDER_NEXT_PUBLIC_MICROSERVICE_URL NEXT_PUBLIC_LOGIN_REQUEST_SCOPE=PLACEHOLDER_NEXT_PUBLIC_LOGIN_REQUEST_SCOPE npm run build
-#
-## Stage 2: Run the Next.js app
-#FROM node:20-alpine
-#
-#WORKDIR /app
-#
-## Install necessary dependencies
-#RUN apk add --no-cache libc6-compat
-#
-## Copy the built files from the previous stage
-#COPY --from=build /app ./
-#
-#ENV PORT=80
-#
-## Expose the port the app runs on
-#EXPOSE 80
-#
-#COPY --chown=nextjs:nodejs entrypoint.sh /entrypoint.sh
-#RUN chmod +x /entrypoint.sh
-##ENTRYPOINT ["/entrypoint.sh"]
-#
-## Start the Next.js app
-#CMD ["npm", "start"]
-
-
+# Stage 1: Install dependencies
 FROM node:20-alpine AS dependencies
 RUN apk add --no-cache libc6-compat
 WORKDIR /home/app
@@ -95,6 +6,7 @@ COPY package.json ./
 COPY package-lock.json ./
 RUN npm i
 
+# Stage 2: Build the app
 FROM node:20-alpine AS builder
 WORKDIR /home/app
 COPY --from=dependencies /home/app/node_modules ./node_modules
@@ -104,8 +16,8 @@ ARG NODE_ENV
 ENV NODE_ENV=${NODE_ENV}
 RUN npm run build
 
+# Stage 3: Create the final image
 FROM node:18-slim AS runner
-
 WORKDIR /home/app
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV NODE_ENV=production
@@ -115,12 +27,16 @@ COPY --from=builder /home/app/.next/static /home/app/standalone/.next/static
 COPY --from=builder /home/app/entrypoint.sh ./scripts/entrypoint.sh
 COPY --from=builder /home/app/.env.production ./.env.production
 
+# Set the environment variables
 ENV PORT=80
 EXPOSE 80
 ENV HOSTNAME="0.0.0.0"
 
+# Make the entrypoint script executable
 RUN chmod +x ./scripts/entrypoint.sh
 
+# Run the entrypoint script to set the environment variables
 ENTRYPOINT [ "./scripts/entrypoint.sh" ]
 
+# Start the server
 CMD ["node", "./standalone/server.js"]
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 2201d19..69d0ded 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -1,23 +1,3 @@
-#services:
-#  eduquest-frontend:
-#    build:
-#      context: .
-#      dockerfile: Dockerfile
-#    entrypoint: ["/entrypoint.sh"]
-#    ports:
-#      - "3000:80"
-#    restart: always
-#    volumes:
-#      - /app/node_modules
-#      - /app/.next
-#    environment:
-#      NEXT_PUBLIC_SITE_URL: ${NEXT_PUBLIC_SITE_URL}
-#      NEXT_PUBLIC_AZURE_CLIENT_ID: ${NEXT_PUBLIC_AZURE_CLIENT_ID}
-#      NEXT_PUBLIC_AZURE_REDIRECT_URI: ${NEXT_PUBLIC_AZURE_REDIRECT_URI}
-#      NEXT_PUBLIC_BACKEND_URL: ${NEXT_PUBLIC_BACKEND_URL}
-#      NEXT_PUBLIC_MICROSERVICE_URL: ${NEXT_PUBLIC_MICROSERVICE_URL}
-#      NEXT_PUBLIC_LOGIN_REQUEST_SCOPE: ${NEXT_PUBLIC_LOGIN_REQUEST_SCOPE}
-#
 services:
   frontend:
     build:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8044a95..1dd045a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,22 +1,3 @@
-#services:
-#  eduquest-frontend:
-#    image: xeroxisxs/eduquest-frontend-nextjs:latest
-#    entrypoint: ["/entrypoint.sh"]
-#    ports:
-#      - "80:80"
-#    restart: always
-#    volumes:
-#      - /app/node_modules
-#      - /app/.next
-#    environment:
-#      NEXT_PUBLIC_SITE_URL: ${NEXT_PUBLIC_SITE_URL}
-#      NEXT_PUBLIC_AZURE_CLIENT_ID: ${NEXT_PUBLIC_AZURE_CLIENT_ID}
-#      NEXT_PUBLIC_AZURE_REDIRECT_URI: ${NEXT_PUBLIC_AZURE_REDIRECT_URI}
-#      NEXT_PUBLIC_BACKEND_URL: ${NEXT_PUBLIC_BACKEND_URL}
-#      NEXT_PUBLIC_MICROSERVICE_URL: ${NEXT_PUBLIC_MICROSERVICE_URL}
-#      NEXT_PUBLIC_LOGIN_REQUEST_SCOPE: ${NEXT_PUBLIC_LOGIN_REQUEST_SCOPE}
-
-
 services:
   frontend:
     image: xeroxisxs/eduquest-frontend-reactjs:latest
diff --git a/src/components/auth/sign-in-form.tsx b/src/components/auth/sign-in-form.tsx
index 5a11018..3a846cb 100644
--- a/src/components/auth/sign-in-form.tsx
+++ b/src/components/auth/sign-in-form.tsx
@@ -23,14 +23,6 @@ export function SignInForm({ error }: SignInFormProps): React.JSX.Element {
       <Typography align="center" variant="h6">
         Welcome to EduQuest!
       </Typography>
-      {/*<Typography align="center" variant="body1">*/}
-      {/*  {process.env.NEXT_PUBLIC_AZURE_CLIENT_ID}*/}
-      {/*  {process.env.NEXT_PUBLIC_AZURE_REDIRECT_URI}*/}
-      {/*  {process.env.NEXT_PUBLIC_SITE_URL}*/}
-      {/*  {process.env.NEXT_PUBLIC_BACKEND_URL}*/}
-      {/*  {process.env.NEXT_PUBLIC_MICROSERVICE_URL}*/}
-      {/*  {process.env.NEXT_PUBLIC_LOGIN_REQUEST_SCOPE}*/}
-      {/*</Typography>*/}
       <Typography align="center" variant="body1">
         A platform for you to learn and earn.
       </Typography>