diff --git a/compforge/src/Components/AppHeader.react.jsx b/compforge/src/Components/AppHeader.react.jsx
index 6b6519ef529cf982f0cc107d87b24a3230b7f7be..3103ce805a4788c0eb1339960b62eb82f37e70b6 100644
--- a/compforge/src/Components/AppHeader.react.jsx
+++ b/compforge/src/Components/AppHeader.react.jsx
@@ -24,7 +24,6 @@ import PeopleIcon from '@material-ui/icons/People';
 //Modals
 
 import TemplateModal from './TemplateModal.react';
-import { Divider } from '@material-ui/core';
 
 const useStyles = makeStyles((theme) => ({
   root: {
diff --git a/compforge/src/Components/HomePage.react.jsx b/compforge/src/Components/HomePage.react.jsx
deleted file mode 100644
index 28c1cdeb7ded3a96f3bb45dc664c8036c2dd6df6..0000000000000000000000000000000000000000
--- a/compforge/src/Components/HomePage.react.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { Link } from 'react-router-dom';
-import {Typography, Button} from "@material-ui/core";
-
-
-const HomePage = (props) => {
-   
-  console.log(props);
-  
-  return (<div className='homepage-component' style={{color: '#fff'}}>
-    {props.isAuthenticated && <h1> Welcome, you are in. Please go to the  <Link style={{color: 'white'}} to={'/userhome'} >
-        <Button style={{fontSize: 32, color: 'white'}}> Dashboard </Button>
-      </Link></h1>}
-     {!props.isAuthenticated && <h1>Welcome to CompForge. Please create login or create an account to continue. (add whatever content you want here for the entry page)  </h1>}
-  </div>);
-};
-
-
-
-export default HomePage;
\ No newline at end of file
diff --git a/compforge/src/Components/Signup.react.jsx b/compforge/src/Components/Signup.react.jsx
index 3f2b2ec6cc380033198a1cc235cafb366067f10a..c3367a4fc8268ca132b337745a91e2a268c62128 100644
--- a/compforge/src/Components/Signup.react.jsx
+++ b/compforge/src/Components/Signup.react.jsx
@@ -40,11 +40,6 @@ const Signup = (props) => {
   const [name, setName] = useState('');
   const [password, setPassword] = useState('');
   const [dnerror, setDnerror] = useState(false);
-  let [capval, setCapval] = useState(false);
-
-  function onChange(value) {
-    setCapval(value);
-  }
 
   const handleChange = ({ target }, type) => {
 
diff --git a/compforge/src/Components/SubmitFormModal.react.jsx b/compforge/src/Components/SubmitFormModal.react.jsx
index bd643b1f7c8eaee1f6fdeeebd25a56d46927453a..b652d9b261d20160ddef7c9b2a8b23e990c75e6c 100644
--- a/compforge/src/Components/SubmitFormModal.react.jsx
+++ b/compforge/src/Components/SubmitFormModal.react.jsx
@@ -1,12 +1,9 @@
 import React, { useEffect } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
-import { Container, Button, Paper, TextField, Modal } from '@material-ui/core';
+import { Container, Button, TextField, Modal } from '@material-ui/core';
 import './TemplateModal.scss';
-import CheckCircleOutlineIcon from '@material-ui/icons/CheckCircleOutline';
 
 function getModalStyle() {
-  const top = 50;
-
   return {
     top: 50,
     left: 0,
diff --git a/compforge/src/Components/SubsScreen.react.jsx b/compforge/src/Components/SubsScreen.react.jsx
index 35ef42bfe1bccfb2a43bfda0eff98743cd5fc63e..58a45a871e73891fc1e88e18d505ada96ac0515d 100644
--- a/compforge/src/Components/SubsScreen.react.jsx
+++ b/compforge/src/Components/SubsScreen.react.jsx
@@ -29,7 +29,6 @@ const useStyles = makeStyles({
 const SubsScreen = (props) => {
   let { loading } = props;
   let { formsubs } = props;
-  let { user } = props;
   let { userId } = props;
   const { dispatch } = props;
   const classes = useStyles();
diff --git a/compforge/src/Components/TemplateModal.react.jsx b/compforge/src/Components/TemplateModal.react.jsx
index 7b7bc9eb79f560691062be2c4a89e841fee75ce3..619ba2153d7affd3a3b18f246be6d96bef6746d4 100644
--- a/compforge/src/Components/TemplateModal.react.jsx
+++ b/compforge/src/Components/TemplateModal.react.jsx
@@ -1,11 +1,9 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
-import { Container, Button, Paper, TextField, Modal } from '@material-ui/core';
+import { Container, Button, TextField, Modal } from '@material-ui/core';
 import './TemplateModal.scss';
 
 function getModalStyle() {
-  const top = 50;
-
   return {
     top: 50,
     left: 0,
@@ -95,7 +93,7 @@ function TemplateModal(props) {
 
     let formStateNew = { ...formState };
 
-    if (type == 'sharewith') {
+    if (type === 'sharewith') {
       formStateNew[type] = validateEmail(value.split(','));
       setFormState(formStateNew);
     } else {
diff --git a/compforge/src/Components/UserDashboard.react.jsx b/compforge/src/Components/UserDashboard.react.jsx
index b2b0e22463485c39581549f6190f3bcefdca50fa..a7a3af3dbc98fc28c53d23df4dbd78613f75bd97 100644
--- a/compforge/src/Components/UserDashboard.react.jsx
+++ b/compforge/src/Components/UserDashboard.react.jsx
@@ -1,13 +1,10 @@
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { fetchForms, removeSubOrForm , addFormSubsOrTemplate} from '../actions';
-import { Link } from 'react-router-dom';
 import Loader from './Loader.react';
-import { Typography } from "@material-ui/core";
 import './UserDashboard.scss';
 import { makeStyles } from '@material-ui/core/styles';
 import Table from '@material-ui/core/Table';
-import Button from '@material-ui/core/Button';
 import TableBody from '@material-ui/core/TableBody';
 import TableCell from '@material-ui/core/TableCell';
 import TableContainer from '@material-ui/core/TableContainer';
diff --git a/compforge/src/Components/ViewSubModal.react.jsx b/compforge/src/Components/ViewSubModal.react.jsx
index 024f2534c9744d23dccd9ff64fc9da3ea3e100a3..9671ed8355451da1dfcdccffa12ecc6a97610d07 100644
--- a/compforge/src/Components/ViewSubModal.react.jsx
+++ b/compforge/src/Components/ViewSubModal.react.jsx
@@ -1,11 +1,9 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
-import { Container, Button, Paper, TextField, Modal } from '@material-ui/core';
+import { Container, Button, Modal } from '@material-ui/core';
 import './TemplateModal.scss';
 
 function getModalStyle() {
-  const top = 50;
-
   return {
     top: 50,
     left: 0,
diff --git a/compforge/src/Components/ViewTemplateModal.react.jsx b/compforge/src/Components/ViewTemplateModal.react.jsx
index 3a3db6ae96f3b1c82a61e3ca5e06b3e3b20ddf02..62c2a1d28b60782751c8c0e1c5939df62f6ed001 100644
--- a/compforge/src/Components/ViewTemplateModal.react.jsx
+++ b/compforge/src/Components/ViewTemplateModal.react.jsx
@@ -1,11 +1,9 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
-import { Container, Button, Paper, TextField, Modal } from '@material-ui/core';
+import { Container, Button, Modal } from '@material-ui/core';
 import './TemplateModal.scss';
 
 function getModalStyle() {
-  const top = 50;
-
   return {
     top: 50,
     left: 0,
diff --git a/compforge/src/actions/form.actions.js b/compforge/src/actions/form.actions.js
index 298f97f0632db8d18c5ede1c7d3bbb14537c1bb9..034e2ab0b1f296b0196cd77fbd1becec960086ce 100644
--- a/compforge/src/actions/form.actions.js
+++ b/compforge/src/actions/form.actions.js
@@ -1,4 +1,4 @@
-import { myFirebase, db } from "../firebase/firebase";
+import { myFirebase } from "../firebase/firebase";
 
 export const LOAD__FORMSUB__START = 'LOAD__FORMSUB__START';
 export const LOAD__FORMSUB__SUCCESS = 'LOAD__FORMSUB__SUCCESS';
@@ -85,11 +85,12 @@ export const fetchSub = (mysubs = false) => dispatch => {
         dataParsed.push(newEl);
       });
 
-      if(!mysubs) {
-        dataParsed = dataParsed.filter((el)=>{
-          if(el.submittedbyemail !==  myFirebase.auth().currentUser.email) {
+      if (!mysubs) {
+        dataParsed = dataParsed.filter((el) => {
+          if (el.submittedbyemail !== myFirebase.auth().currentUser.email) {
             return el;
           }
+          return null;
         });
       }
 
diff --git a/compforge/src/reducers/form.reducer.js b/compforge/src/reducers/form.reducer.js
index 8dd63447402585220ffdd7aa0abf4d294675ff5d..e92aab182f82a258dda77333d70ca17c39c698d4 100644
--- a/compforge/src/reducers/form.reducer.js
+++ b/compforge/src/reducers/form.reducer.js
@@ -3,8 +3,6 @@ import {
   LOAD__FORMSUB__SUCCESS,
   LOAD__FORMTEMPLATE__START,
   LOAD__FORMTEMPLATE__SUCCESS,
-  ADDSUB__START,
-  ADDSUB__DONE,
   ADDTEMPLATE__START,
   LOGOUT_SUCCESS,
   ADDTEMPLATE__DONE,