diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/Configure.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/Configure.jsx
index 71f89d67a11..d05b84a8b0a 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/Configure.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/Configure.jsx
@@ -22,7 +22,6 @@ import {FormattedMessage} from "react-intl";
 import Switch from "../../../UIComponents/Switch/Switch";
 import Chip from "../../../UIComponents/Chip/Chip";
 
-
 /**
  * Enable : switch
  * Share between tenants: switch
@@ -44,7 +43,6 @@ class Configure extends Component {
         }
     }
 
-
     /**
      * Create a tag on Enter key press and set it to the state.
      * Clears the tags text field.
@@ -192,7 +190,6 @@ class Configure extends Component {
             </div>
         )
     }
-
 }
 
 export default Configure;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/General.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/General.jsx
index b6895188902..64101218234 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/General.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/General.jsx
@@ -47,8 +47,6 @@ class General extends Component {
     onNextClick() {
         const {name, description, identifier, icon} = this.state;
 
-        console.log("Next")
-
         let general = {
             name: name,
             description: description,
@@ -74,8 +72,6 @@ class General extends Component {
         let field = event.target.name;
         let value = event.target.value;
 
-        console.log(field, value)
-
         switch (field) {
             case("platformName") : {
                 this.setState({name: value});
@@ -93,7 +89,6 @@ class General extends Component {
     }
 
     validate() {
-
         const {name, identifier, description} = this.state;
         let errorCount = 0;
         let errors = {};
@@ -112,7 +107,6 @@ class General extends Component {
             errorCount++;
             errors.description = "Platform Desciption is Required!"
         }
-
         return {errorCount, errors};
     }
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/Properties.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/Properties.jsx
index 89b0d972f32..7e5ae041760 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/Properties.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/CreateSteps/Properties.jsx
@@ -21,7 +21,7 @@ import {Button, Col, FormGroup, Input, Label, ModalBody, ModalFooter, Row} from
 import {FormattedMessage} from "react-intl";
 
 /**
- * key : value +
+ * key : value
  * */
 class Properties extends Component {
     constructor() {
@@ -163,7 +163,6 @@ class Properties extends Component {
             </div>
         )
     }
-
 }
 
 export default Properties;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/PlatformCreate.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/PlatformCreate.jsx
index 38e0ecf4cbe..bcbd4051fb4 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/PlatformCreate.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Create/PlatformCreate.jsx
@@ -46,7 +46,6 @@ class PlatformCreate extends Component {
         }
     }
 
-
     componentWillReceiveProps(props, nextprops) {
         this.setState({open: props.open})
     }
@@ -67,7 +66,6 @@ class PlatformCreate extends Component {
         const {stepIndex} = this.state;
 
         if (stepIndex + 1 > 2) {
-            console.log(this.state);
             this.onSubmit();
         } else {
             this.setState({
@@ -75,8 +73,6 @@ class PlatformCreate extends Component {
                 finished: stepIndex + 1 > 1
             });
         }
-
-
     };
 
     /**
@@ -96,9 +92,6 @@ class PlatformCreate extends Component {
      * */
     onSubmit(platformProps) {
         let {general, configure} = this.state;
-
-        console.log(general);
-
         let platformCreatePromise = PlatformMgtApi.createPlatform(general, configure, platformProps);
         platformCreatePromise.then(response => {
                 console.log(response.data)
@@ -116,7 +109,6 @@ class PlatformCreate extends Component {
      * @param data: The form data of the step.
      * */
     setStepData(step, data) {
-        console.log(data); //TODO: Remove this
         switch (step) {
             case "general": {
                 this.setState({general: data}, this.onNextClick());
@@ -138,14 +130,12 @@ class PlatformCreate extends Component {
      * This clears the data in the current step and returns to the previous step.
      * */
     onPrevClick() {
-        console.log(this.state.stepIndex);
         const {stepIndex} = this.state;
         if (stepIndex > 0) {
             this.setState({stepIndex: stepIndex - 1, finished: false});
         }
     };
 
-
     /**
      * Defines all the Steps in the stepper. (Wizard)
      *
@@ -188,7 +178,6 @@ class PlatformCreate extends Component {
         }
     }
 
-
     getStepperHeaders() {
         return (
             [{index: 1, text: "General"},
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx
index 516768d03c3..5c47f6930d2 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformListing.jsx
@@ -38,7 +38,6 @@ class PlatformListing extends Component {
 
     componentWillMount() {
         PlatformMgtApi.getPlatforms().then(response => {
-            console.log(response);
             this.setState({platforms: response.data});
         }).catch(err => {
             AuthHandler.unauthorizedErrorHandler(err);
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/DataTable.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/DataTable.jsx
index 7869a8fe74b..c25b1edc211 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/DataTable.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/DataTable.jsx
@@ -54,18 +54,12 @@ class DataTable extends Component {
         this.scriptId = "data-table"
     };
 
-    /**
-     * Triggers when user click on table row.
-     * This method invokes the parent method handleRowClick, which is passed via props.
-     * */
-
     render() {
         return (
             <div className="data-table">
                 {this.props.children}
             </div>
         )
-
     }
 }
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/DataTableHeader.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/DataTableHeader.jsx
index bad2de74508..588f2e58f30 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/DataTableHeader.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/DataTableHeader.jsx
@@ -56,10 +56,6 @@ class DataTableHeader extends Component {
     }
 
     render() {
-        /*margin-top: 30px
-        * margin-bottom: 10px
-        * */
-
         return (
             <Row className="data-table-header">
                 {this.props.headers.map(header => {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/HeaderCell.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/HeaderCell.js
index 9462ec8e5bb..746bff374b9 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/HeaderCell.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable/HeaderCell.js
@@ -44,7 +44,6 @@ class HeaderCell extends Component {
 
     componentWillUnmount() {
         Theme.removeThemingScripts(this.scriptId);
-
     }
 
     /**
@@ -56,10 +55,6 @@ class HeaderCell extends Component {
     }
 
     render() {
-        /*margin-top: 30px
-        * margin-bottom: 10px
-        * */
-
         return (
             <Row className="data-table-header">
                 {this.props.headers.map(header => {