diff --git a/frontend/src/component/feature/form/form-view-feature-component.jsx b/frontend/src/component/feature/form/form-view-feature-component.jsx
index bdcaab61e2..3fa862c5a6 100644
--- a/frontend/src/component/feature/form/form-view-feature-component.jsx
+++ b/frontend/src/component/feature/form/form-view-feature-component.jsx
@@ -4,20 +4,8 @@ import StrategiesSection from './strategies-section-container';
 import { Button, Icon } from 'react-mdl';
 
 class ViewFeatureComponent extends Component {
-    // static displayName = `UpdateFeatureComponent-{getDisplayName(Component)}`;
-    componentWillMount() {
-        // TODO unwind this stuff
-        if (this.props.initCallRequired === true) {
-            this.props.init(this.props.input);
-        }
-    }
-
     render() {
         const { input, onCancel } = this.props;
-
-        const {
-            name, // eslint-disable-line
-        } = input;
         const configuredStrategies = input.strategies || [];
 
         return (
diff --git a/frontend/src/component/feature/view-component.jsx b/frontend/src/component/feature/view-component.jsx
index c000eaf720..2d287456fd 100644
--- a/frontend/src/component/feature/view-component.jsx
+++ b/frontend/src/component/feature/view-component.jsx
@@ -164,24 +164,14 @@ export default class ViewFeatureToggleComponent extends React.Component {
                     }}
                 >
                     <span style={{ paddingRight: '24px' }}>
-                        {this.isFeatureView ? (
-                            <Switch
-                                ripple
-                                checked={featureToggle.enabled}
-                                onChange={() => toggleFeature(featureToggle.name)}
-                            >
-                                {featureToggle.enabled ? 'Enabled' : 'Disabled'}
-                            </Switch>
-                        ) : (
-                            <Switch
-                                disabled
-                                ripple
-                                checked={featureToggle.enabled}
-                                onChange={() => toggleFeature(featureToggle.name)}
-                            >
-                                {featureToggle.enabled ? 'Enabled' : 'Disabled'}
-                            </Switch>
-                        )}
+                        <Switch
+                            disabled={this.isFeatureView}
+                            ripple
+                            checked={featureToggle.enabled}
+                            onChange={() => toggleFeature(featureToggle.name)}
+                        >
+                            {featureToggle.enabled ? 'Enabled' : 'Disabled'}
+                        </Switch>
                     </span>
 
                     {this.isFeatureView ? (