diff --git a/packages/patternfly-4/react-core/src/components/Form/Form.docs.js b/packages/patternfly-4/react-core/src/components/Form/Form.docs.js
index 723f69ad8f4..67872bd6963 100644
--- a/packages/patternfly-4/react-core/src/components/Form/Form.docs.js
+++ b/packages/patternfly-4/react-core/src/components/Form/Form.docs.js
@@ -1,6 +1,5 @@
 import Simple from './examples/SimpleForm';
 import Horizontal from './examples/HorizontalForm';
-import Various from './examples/VariousLabelsForm';
 import Invalid from './examples/InvalidForm';
 import { Form, FormGroup, ActionGroup } from '@patternfly/react-core';
 
@@ -14,11 +13,6 @@ export default {
   examples: [
     { component: Simple, title: 'Simple Form' },
     { component: Horizontal, title: 'Horizontal form' },
-    { component: Invalid, title: 'Invalid form' },
-    {
-      component: Various,
-      title: 'Various labels and helper text',
-      description: 'Label and helperText can be a string, a function or a node.'
-    }
+    { component: Invalid, title: 'Invalid form' }
   ]
 };
diff --git a/packages/patternfly-4/react-core/src/components/Form/examples/InvalidForm.js b/packages/patternfly-4/react-core/src/components/Form/examples/InvalidForm.js
index 8417906c6a2..2d873e5309c 100644
--- a/packages/patternfly-4/react-core/src/components/Form/examples/InvalidForm.js
+++ b/packages/patternfly-4/react-core/src/components/Form/examples/InvalidForm.js
@@ -2,28 +2,35 @@ import React from 'react';
 import { Form, FormGroup, TextInput } from '@patternfly/react-core';
 
 class InvalidForm extends React.Component {
+  state = {
+    value: 'Five',
+    isValid: false
+  };
+
+  handleTextInputChange = value => {
+    this.setState({ value, isValid: /^\d+$/.test(value) });
+  };
+
   render() {
+    const { value, isValid } = this.state;
+
     return (
       <Form>
         <FormGroup
-          isRequired
-          label="Email"
-          helperText="This is should be your email"
-          helperTextInvalid="Your email is not in a correct format"
-          fieldId="email-label"
-          isValid={false}
-        >
-          <TextInput isValid={false} value="email||email.com" id="email-label" aria-describedby="email-label-helper" />
-        </FormGroup>
-        <FormGroup
-          label="Age"
+          label="Age:"
           type="number"
           helperText="Please write your age"
           helperTextInvalid="Age has to be a number"
           fieldId="age"
-          isValid={false}
+          isValid={isValid}
         >
-          <TextInput isValid={false} value="Five" id="age" aria-describedby="age-helper" />
+          <TextInput
+            isValid={isValid}
+            value={value}
+            id="age"
+            aria-describedby="age-helper"
+            onChange={this.handleTextInputChange}
+          />
         </FormGroup>
       </Form>
     );
diff --git a/packages/patternfly-4/react-core/src/components/Form/examples/SimpleForm.js b/packages/patternfly-4/react-core/src/components/Form/examples/SimpleForm.js
index dfa535a4868..1a642179117 100644
--- a/packages/patternfly-4/react-core/src/components/Form/examples/SimpleForm.js
+++ b/packages/patternfly-4/react-core/src/components/Form/examples/SimpleForm.js
@@ -82,6 +82,9 @@ class SimpleForm extends React.Component {
             aria-label="Please don't contact me"
           />
         </FormGroup>
+        <FormGroup label="Additional Note:" fieldId="simple-form-note">
+          <TextInput isDisabled type="text" id="simple-form-note" name="simple-form-number" value="disabled" />
+        </FormGroup>
         <FormGroup fieldId="checkbox1">
           <Checkbox label="I'd like updates via email" id="checkbox1" name="checkbox1" aria-label="Update via email" />
         </FormGroup>
diff --git a/packages/patternfly-4/react-core/src/components/Form/examples/VariousLabelsForm.js b/packages/patternfly-4/react-core/src/components/Form/examples/VariousLabelsForm.js
deleted file mode 100644
index b5de185d224..00000000000
--- a/packages/patternfly-4/react-core/src/components/Form/examples/VariousLabelsForm.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import { Form, FormGroup, TextInput, Badge } from '@patternfly/react-core';
-
-class VariousLabelsForm extends React.Component {
-  state = {
-    value1: '',
-    value2: ''
-  };
-
-  handleTextInputChange1 = value1 => {
-    this.setState({ value1 });
-  };
-
-  handleTextInputChange2 = value2 => {
-    this.setState({ value2 });
-  };
-
-  render() {
-    const d = new Date();
-    const renderHelperText = () => `This is a function from ${String(d.getSeconds())}th second of this minute!`;
-    const { value1, value2 } = this.state;
-
-    return (
-      <Form>
-        <FormGroup label={renderHelperText()} helperText="This is a helper text" fieldId="label-function">
-          <TextInput value={value1} onChange={this.handleTextInputChange1} id="label-function" />
-        </FormGroup>
-        <FormGroup label={<h1>This is a just header</h1>} helperText={<Badge>Badge here!</Badge>} fieldId="object-id">
-          <TextInput value={value2} onChange={this.handleTextInputChange2} aria-label="Object" id="object-id" />
-        </FormGroup>
-      </Form>
-    );
-  }
-}
-
-export default VariousLabelsForm;