diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json
index e2382bdd84..884c644d10 100644
--- a/.eslintrc.es6.json
+++ b/.eslintrc.es6.json
@@ -52,7 +52,6 @@
     "no-script-url": 0,
     "space-infix-ops": 0,
     "no-irregular-whitespace": 0,
-    "padded-blocks": 0,
     "no-underscore-dangle": 0
   }
 }
diff --git a/assets/js/src/form/fields/select.jsx b/assets/js/src/form/fields/select.jsx
index 79d8f7b688..059cb7a1b7 100644
--- a/assets/js/src/form/fields/select.jsx
+++ b/assets/js/src/form/fields/select.jsx
@@ -43,7 +43,6 @@ const FormFieldSelect = React.createClass({
 
     const options = keys.map(
       (value, index) => {
-
         if (filter !== false && filter(this.props.item, value) === false) {
           return;
         }
diff --git a/assets/js/src/form/form.jsx b/assets/js/src/form/form.jsx
index f63e9419f8..f0b451a232 100644
--- a/assets/js/src/form/form.jsx
+++ b/assets/js/src/form/form.jsx
@@ -15,7 +15,6 @@ define(
     FormField,
     jQuery
   ) => {
-
     const Form = React.createClass({
       contextTypes: {
         router: React.PropTypes.object.isRequired,
diff --git a/assets/js/src/help/help.jsx b/assets/js/src/help/help.jsx
index 57002d821d..6e7952e5fd 100644
--- a/assets/js/src/help/help.jsx
+++ b/assets/js/src/help/help.jsx
@@ -17,7 +17,6 @@ const App = React.createClass({
 const container = document.getElementById('help_container');
 
 if (container) {
-
   ReactDOM.render((
     <Router history={history}>
       <Route path="/" component={App}>
@@ -28,5 +27,4 @@ if (container) {
       </Route>
     </Router>
   ), container);
-
 }
diff --git a/assets/js/src/help/knowledge_base.jsx b/assets/js/src/help/knowledge_base.jsx
index 58d9c713cd..7450926a3e 100644
--- a/assets/js/src/help/knowledge_base.jsx
+++ b/assets/js/src/help/knowledge_base.jsx
@@ -4,7 +4,6 @@ import MailPoet from 'mailpoet';
 import Tabs from './tabs.jsx';
 
 function KnowledgeBase() {
-
   return (
     <div>
 
diff --git a/assets/js/src/help/tabs.jsx b/assets/js/src/help/tabs.jsx
index 4f2b3e32f3..2fce2de4f9 100644
--- a/assets/js/src/help/tabs.jsx
+++ b/assets/js/src/help/tabs.jsx
@@ -17,7 +17,6 @@ const tabs = [
 ];
 
 function Tabs(props) {
-
   const tabLinks = tabs.map((tab, index) => {
     const tabClasses = classNames(
       'nav-tab',
diff --git a/assets/js/src/listing/groups.jsx b/assets/js/src/listing/groups.jsx
index f5f4008f02..baa24db658 100644
--- a/assets/js/src/listing/groups.jsx
+++ b/assets/js/src/listing/groups.jsx
@@ -1,5 +1,4 @@
 define(['react', 'classnames'], (React, classNames) => {
-
   const ListingGroups = React.createClass({
     handleSelect: function (group) {
       return this.props.onSelectGroup(group);
diff --git a/assets/js/src/listing/pages.jsx b/assets/js/src/listing/pages.jsx
index 46b2f862ad..e7f45b000a 100644
--- a/assets/js/src/listing/pages.jsx
+++ b/assets/js/src/listing/pages.jsx
@@ -7,7 +7,6 @@ define([
     classNames,
     MailPoet
   ) => {
-
   const ListingPages = React.createClass({
     getInitialState: function () {
       return {
diff --git a/assets/js/src/listing/search.jsx b/assets/js/src/listing/search.jsx
index b0488ffb98..407e7b0745 100644
--- a/assets/js/src/listing/search.jsx
+++ b/assets/js/src/listing/search.jsx
@@ -5,7 +5,6 @@ define([
     MailPoet,
     React
   ) => {
-
   const ListingSearch = React.createClass({
     handleSearch: function (e) {
       e.preventDefault();
diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx
index ed0fd2bf1d..996ef5a34c 100644
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@@ -25,7 +25,6 @@ define(
     HelpTooltip,
     jQuery
   ) => {
-
     const NewsletterSend = React.createClass({
       contextTypes: {
         router: React.PropTypes.object.isRequired,
diff --git a/assets/js/src/newsletters/send/notification.jsx b/assets/js/src/newsletters/send/notification.jsx
index 60a9e8b2f5..6a20a089b2 100644
--- a/assets/js/src/newsletters/send/notification.jsx
+++ b/assets/js/src/newsletters/send/notification.jsx
@@ -11,7 +11,6 @@ define(
     Scheduling,
     _
   ) => {
-
     let fields = [
       {
         name: 'subject',
diff --git a/assets/js/src/newsletters/send/standard.jsx b/assets/js/src/newsletters/send/standard.jsx
index 9a996e8b2d..c6a1ec2dbd 100644
--- a/assets/js/src/newsletters/send/standard.jsx
+++ b/assets/js/src/newsletters/send/standard.jsx
@@ -13,7 +13,6 @@ define(
     MailPoet,
     Hooks
   ) => {
-
     const jQuery = jq;
 
     const currentTime = window.mailpoet_current_time || '00:00';
diff --git a/assets/js/src/newsletters/send/welcome.jsx b/assets/js/src/newsletters/send/welcome.jsx
index b78b66e799..ab37fbfb49 100644
--- a/assets/js/src/newsletters/send/welcome.jsx
+++ b/assets/js/src/newsletters/send/welcome.jsx
@@ -9,8 +9,6 @@ define(
     Hooks,
     Scheduling
   ) => {
-
-
     let fields = [
       {
         name: 'subject',
diff --git a/assets/js/src/newsletters/templates.jsx b/assets/js/src/newsletters/templates.jsx
index db40169597..ae42a1be53 100644
--- a/assets/js/src/newsletters/templates.jsx
+++ b/assets/js/src/newsletters/templates.jsx
@@ -17,7 +17,6 @@ define(
     Breadcrumb,
     HelpTooltip
   ) => {
-
     const ImportTemplate = React.createClass({
       saveTemplate: function (saveTemplate) {
         const template = saveTemplate;
diff --git a/assets/js/src/newsletters/types/notification/notification.jsx b/assets/js/src/newsletters/types/notification/notification.jsx
index 5881e526fb..93c2fd5c67 100644
--- a/assets/js/src/newsletters/types/notification/notification.jsx
+++ b/assets/js/src/newsletters/types/notification/notification.jsx
@@ -15,7 +15,6 @@ define(
     Scheduling,
     Breadcrumb
   ) => {
-
     const field = {
       name: 'options',
       type: 'reactComponent',
diff --git a/assets/js/src/newsletters/types/standard.jsx b/assets/js/src/newsletters/types/standard.jsx
index a5e6ea6fc0..65f5118e96 100644
--- a/assets/js/src/newsletters/types/standard.jsx
+++ b/assets/js/src/newsletters/types/standard.jsx
@@ -11,7 +11,6 @@ define(
     MailPoet,
     Breadcrumb
   ) => {
-
     const NewsletterStandard = React.createClass({
       contextTypes: {
         router: React.PropTypes.object.isRequired,
diff --git a/assets/js/src/segments/form.jsx b/assets/js/src/segments/form.jsx
index a3ae41a1e1..7e8261ac11 100644
--- a/assets/js/src/segments/form.jsx
+++ b/assets/js/src/segments/form.jsx
@@ -11,7 +11,6 @@ define(
     MailPoet,
     Form
   ) => {
-
     const fields = [
       {
         name: 'name',