diff --git a/client/app/static/article.jsx b/client/app/static/article.jsx
index ed1893a..6465127 100755
--- a/client/app/static/article.jsx
+++ b/client/app/static/article.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import {Link, hashHistory} from 'react-router';
 import Loader from './loader.jsx';
-var Remarkable = require('remarkable');
 import Alert from 'react-s-alert';
 
 class ViewArticle extends React.Component {
diff --git a/client/app/static/browse_topics.jsx b/client/app/static/browse_topics.jsx
index 89e4e71..26dd1a8 100755
--- a/client/app/static/browse_topics.jsx
+++ b/client/app/static/browse_topics.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import Error from './error.jsx';
 import Loader from './loader.jsx';
 import {hashHistory} from 'react-router';
 import Alert from 'react-s-alert';
diff --git a/client/app/static/edit.jsx b/client/app/static/edit.jsx
index 04e58b8..45f43f5 100755
--- a/client/app/static/edit.jsx
+++ b/client/app/static/edit.jsx
@@ -1,16 +1,7 @@
 import React from 'react';
-import autosize from 'autosize';
 import {hashHistory} from 'react-router';
 import Alert from 'react-s-alert';
 import Loader from './loader.jsx';
-import Markdown from './markdown.jsx';
-var Remarkable = require('remarkable');
-var md = new Remarkable({
-html: true,
-breaks: true,
-linkify: true
-});
-
 
 class EditArticle extends React.Component {
   constructor(props) {
@@ -58,10 +49,6 @@ class EditArticle extends React.Component {
     }
   }
 
-  getRawMarkupBody() {
-    return { __html: md.render(this.state.body) };
-  }
-
 
   componentDidMount() {
     var myHeaders = new Headers({
@@ -103,7 +90,6 @@ class EditArticle extends React.Component {
         that.setState({topics: response.data})
       }
     });
-    autosize(document.querySelectorAll('textarea'));
   }
 
   render() {
diff --git a/client/app/static/error.jsx b/client/app/static/error.jsx
deleted file mode 100755
index 380a67e..0000000
--- a/client/app/static/error.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-class Error extends React.Component {
-  render () {
-    if(this.props.error=="")
-      return <div></div>;
-    else
-      return(<div className="alert alert-danger" role="alert">
-              {this.props.error}
-            </div>)
-  }
-}
-
-export default Error;
diff --git a/client/app/static/history.jsx b/client/app/static/history.jsx
index 4775be0..ded1862 100755
--- a/client/app/static/history.jsx
+++ b/client/app/static/history.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import {Link} from 'react-router';
 import Loader from './loader.jsx';
-import Error from './error.jsx';
 import BrowseArchives from './browse_archives.jsx';
 import SimpleArticle from './simple_article.jsx';
 var Remarkable = require('remarkable');
diff --git a/client/app/static/login.jsx b/client/app/static/login.jsx
index 3187121..30fbefd 100755
--- a/client/app/static/login.jsx
+++ b/client/app/static/login.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import Error from './error.jsx';
 import { hashHistory } from 'react-router';
 import Alert from 'react-s-alert';
 
diff --git a/client/app/static/markdown.jsx b/client/app/static/markdown.jsx
deleted file mode 100755
index 8656c9a..0000000
--- a/client/app/static/markdown.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from 'react';
-
-class Markdown extends React.Component {
-
-  render () {
-    return(<div className="table-responsive">
-      <table className="table table-striped">
-        <thead>
-          <tr>
-          <th>Markdown</th>
-          <th>Result</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>**text**</td><td>Bold</td>
-          </tr>
-          <tr>
-            <td>*text*</td><td>Emphasize</td>
-          </tr>
-          <tr>
-            <td>~~text~~</td><td>Strike-through</td>
-          </tr>
-          <tr>
-            <td>[title](http://)</td><td>Link</td>
-          </tr>
-          <tr>
-            <td>`code`</td><td>Inline Code</td>
-          </tr>
-          <tr>
-            <td>![alt](http://)</td><td>Image</td>
-          </tr>
-          <tr>
-            <td>* item</td><td>List</td>
-          </tr>
-          <tr>
-            <td>> quote</td><td>Blockquote</td>
-          </tr>
-          <tr>
-            <td># Heading</td><td>H1</td>
-          </tr>
-          <tr>
-            <td>## Heading</td><td>H2</td>
-          </tr>
-          <tr>
-            <td>### Heading</td><td>H3</td>
-          </tr>
-        </tbody>
-      </table>
-    </div>);
-  }
-}
-
-export default Markdown;
diff --git a/client/app/static/new.jsx b/client/app/static/new.jsx
index f6e8970..978123e 100755
--- a/client/app/static/new.jsx
+++ b/client/app/static/new.jsx
@@ -36,7 +36,6 @@ class NewArticle extends React.Component {
       }
       that.setState({loading: false});
     });
-    autosize(document.querySelectorAll('textarea'));
   }
 
   handleSubmit(e) {
@@ -72,11 +71,6 @@ class NewArticle extends React.Component {
     }
   }
 
-
-  getRawMarkupBody() {
-    return { __html: md.render(this.state.body) };
-  }
-
   render() {
     if(this.state.loading)
       return <Loader/>;
diff --git a/client/index.html b/client/index.html
index 6ebbdc0..88b3b2a 100755
--- a/client/index.html
+++ b/client/index.html
@@ -3,12 +3,17 @@
     <meta charset="utf-8">
     <title>Matterwiki</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The default bootstrap CSS with some modifications -->
     <link rel="stylesheet" href="./assets/bootstrap.css" />
+    <!-- Customizations and CSS for custom classes -->
     <link rel="stylesheet" href="./assets/style.css" />
+    <!-- CSS for the text editor. Basecamp's Trix -->
     <link rel="stylesheet" href="./assets/trix.css" />
     <script src="./assets/jquery.js" type="text/javascript"></script>
+    <!-- JS for the text editor. Basecamp's Trix -->
     <script src="./assets/trix.js" type="text/javascript"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+    <!-- Custom jQuery additions, not found in the bootrap JS file -->
     <script src="./assets/custom.js" type="text/javascript"></script>
   </head>
   <body>
diff --git a/package.json b/package.json
index 8e860be..8a442b9 100755
--- a/package.json
+++ b/package.json
@@ -1,12 +1,11 @@
 {
-  "name": "matterwiki",
+  "name": "Matterwiki",
   "version": "0.1.0",
-  "description": "a simple and sexy wiki",
+  "description": "A simple and beautiful wiki for teams",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "./node_modules/.bin/webpack -d --watch",
-    "webpack-server": "./node_modules/.bin/webpack-dev-server --content-base client/",
     "build": "./node_modules/.bin/webpack -p",
     "start": "node index"
   },
@@ -18,16 +17,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/nshntarora/matterwiki.git"
+    "url": "git+https://github.com/Matterwiki/Matterwiki.git"
   },
-  "author": "",
-  "license": "ISC",
+  "author": "Nishant Arora (@nshntarora)",
+  "license": "MIT",
   "bugs": {
-    "url": "https://github.com/nshntarora/matterwiki/issues"
+    "url": "https://github.com/Matterwiki/Matterwiki/issues"
   },
-  "homepage": "https://github.com/nshntarora/matterwiki#readme",
+  "homepage": "http://matterwiki.com",
   "dependencies": {
-    "autosize": "3.0.20",
     "babel-core": "6.21.0",
     "babel-loader": "6.2.5",
     "babel-preset-es2015": "6.13.2",
@@ -43,11 +41,7 @@
     "react-dom": "15.3.0",
     "react-router": "2.8.1",
     "react-s-alert": "1.2.2",
-    "remarkable": "1.7.1",
     "sqlite3": "^3.1.4",
     "webpack": "1.13.2"
-  },
-  "devDependencies": {
-    "webpack-dev-server": "1.16.2"
   }
 }