From d1b8d8bcc125566c1217cf77b3fbb7409636609a Mon Sep 17 00:00:00 2001
From: jbadan <jenna.badanowski@gmail.com>
Date: Tue, 1 Oct 2019 09:35:05 -0700
Subject: [PATCH] remove customStyles from prop destrcturing

---
 src/ActionBar/ActionBar.js                   | 2 +-
 src/ActionBar/_ActionBarBack.js              | 1 -
 src/Badge/Badge.js                           | 2 +-
 src/Badge/Counter.js                         | 2 +-
 src/Badge/Label.js                           | 2 +-
 src/Badge/Status.js                          | 2 +-
 src/Breadcrumb/Breadcrumb.js                 | 2 +-
 src/Button/Button.js                         | 1 -
 src/Button/ButtonGroup.js                    | 2 +-
 src/Calendar/Calendar.js                     | 1 -
 src/ComboboxInput/ComboboxInput.js           | 2 +-
 src/DatePicker/DatePicker.js                 | 5 ++---
 src/Dropdown/Dropdown.js                     | 2 +-
 src/Forms/Checkbox.js                        | 2 +-
 src/Forms/FormFieldset.js                    | 2 +-
 src/Forms/FormInput.js                       | 2 +-
 src/Forms/FormItem.js                        | 2 +-
 src/Forms/FormLabel.js                       | 2 +-
 src/Forms/FormLegend.js                      | 2 +-
 src/Forms/FormMessage.js                     | 2 +-
 src/Forms/FormRadioGroup.js                  | 2 +-
 src/Forms/FormRadioItem.js                   | 2 +-
 src/Forms/FormSelect.js                      | 2 +-
 src/Forms/FormSet.js                         | 2 +-
 src/Forms/FormTextarea.js                    | 2 +-
 src/Icon/Icon.js                             | 2 +-
 src/Identifier/Identifier.js                 | 2 +-
 src/Image/Image.js                           | 2 +-
 src/InlineHelp/InlineHelp.js                 | 2 +-
 src/InputGroup/FormGroup.js                  | 2 +-
 src/InputGroup/InputGroup.js                 | 1 -
 src/LayoutGrid/LayoutGrid.js                 | 2 +-
 src/Link/Link.js                             | 2 +-
 src/ListGroup/ListGroup.js                   | 2 +-
 src/LocalizationEditor/LocalizationEditor.js | 2 +-
 src/Menu/Menu.js                             | 2 +-
 src/Modal/Modal.js                           | 1 -
 src/MultiInput/MultiInput.js                 | 1 -
 src/Pagination/Pagination.js                 | 1 -
 src/Panel/Panel.js                           | 2 +-
 src/Popover/Popover.js                       | 1 -
 src/SearchInput/SearchInput.js               | 1 -
 src/SideNavigation/SideNav.js                | 2 +-
 src/Table/Table.js                           | 2 +-
 src/Tabs/Tab.js                              | 2 +-
 src/Tabs/TabGroup.js                         | 1 -
 src/Tile/Tile.js                             | 1 -
 src/Time/Time.js                             | 1 -
 src/TimePicker/TimePicker.js                 | 1 -
 src/Toggle/Toggle.js                         | 2 +-
 src/Token/Token.js                           | 2 +-
 src/TreeView/TreeView.js                     | 1 -
 src/utils/WithStyles/TestComponent.js        | 1 -
 53 files changed, 39 insertions(+), 55 deletions(-)

diff --git a/src/ActionBar/ActionBar.js b/src/ActionBar/ActionBar.js
index d5f4a1000..eeeb45a8e 100644
--- a/src/ActionBar/ActionBar.js
+++ b/src/ActionBar/ActionBar.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const ActionBar = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
+const ActionBar = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
     const actionBarClasses = classnames(
         'fd-action-bar',
         className
diff --git a/src/ActionBar/_ActionBarBack.js b/src/ActionBar/_ActionBarBack.js
index c68b87f92..16e9974f9 100644
--- a/src/ActionBar/_ActionBarBack.js
+++ b/src/ActionBar/_ActionBarBack.js
@@ -28,7 +28,6 @@ ActionBarBack.displayName = 'ActionBar.Back';
 ActionBarBack.propTypes = {
     buttonProps: PropTypes.object,
     className: PropTypes.string,
-    customStyles: PropTypes.object,
     disableStyles: PropTypes.bool,
     onClick: PropTypes.func
 };
diff --git a/src/Badge/Badge.js b/src/Badge/Badge.js
index d503ae25e..161b8886d 100644
--- a/src/Badge/Badge.js
+++ b/src/Badge/Badge.js
@@ -5,7 +5,7 @@ import withStyles from '../utils/WithStyles/WithStyles';
 import { BADGE_MODIFIERS, BADGE_TYPES } from '../utils/constants';
 
 
-const Badge = React.forwardRef(({ type, modifier, children, className, customStyles, disableStyles, ...props }, ref) => {
+const Badge = React.forwardRef(({ type, modifier, children, className, disableStyles, ...props }, ref) => {
     const badgeClasses = classnames(
         'fd-badge',
         {
diff --git a/src/Badge/Counter.js b/src/Badge/Counter.js
index 16f941927..f4d9b26b6 100644
--- a/src/Badge/Counter.js
+++ b/src/Badge/Counter.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Counter = React.forwardRef(({ localizedText, notification, children, className, customStyles, disableStyles, ...props }, ref) => {
+const Counter = React.forwardRef(({ localizedText, notification, children, className, disableStyles, ...props }, ref) => {
     const counterClasses = classnames(
         'fd-counter',
         {
diff --git a/src/Badge/Label.js b/src/Badge/Label.js
index 39e95faea..5066118b2 100644
--- a/src/Badge/Label.js
+++ b/src/Badge/Label.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Label = React.forwardRef(({ type, children, className, customStyles, disableStyles, ...props }, ref) => {
+const Label = React.forwardRef(({ type, children, className, disableStyles, ...props }, ref) => {
     const labelClasses = classnames(
         'fd-label',
         {
diff --git a/src/Badge/Status.js b/src/Badge/Status.js
index bcb5e9dc2..d04c90a18 100644
--- a/src/Badge/Status.js
+++ b/src/Badge/Status.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { STATUS_TYPES } from '../utils/constants';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Status = React.forwardRef(({ type, glyph, children, className, customStyles, disableStyles, ...props }, ref) => {
+const Status = React.forwardRef(({ type, glyph, children, className, disableStyles, ...props }, ref) => {
     const statusClasses = classnames(
         'fd-status-label',
         {
diff --git a/src/Breadcrumb/Breadcrumb.js b/src/Breadcrumb/Breadcrumb.js
index 2e8499a2e..b556f0921 100644
--- a/src/Breadcrumb/Breadcrumb.js
+++ b/src/Breadcrumb/Breadcrumb.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Breadcrumb = React.forwardRef(({ children, customStyles, disableStyles, ...props }, ref) => {
+const Breadcrumb = React.forwardRef(({ children, disableStyles, ...props }, ref) => {
     return (<ul {...props}
         className='fd-breadcrumb'
         ref={ref}>{children}</ul>);
diff --git a/src/Button/Button.js b/src/Button/Button.js
index f25e8df5b..24e050595 100644
--- a/src/Button/Button.js
+++ b/src/Button/Button.js
@@ -8,7 +8,6 @@ const Button = React.forwardRef(({
     option,
     type,
     compact,
-    customStyles,
     disableStyles,
     glyph,
     selected,
diff --git a/src/Button/ButtonGroup.js b/src/Button/ButtonGroup.js
index 8a85517f6..54240c11c 100644
--- a/src/Button/ButtonGroup.js
+++ b/src/Button/ButtonGroup.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const ButtonGroup = React.forwardRef(({ children, customStyles, disableStyles, ...props }, ref) => {
+const ButtonGroup = React.forwardRef(({ children, disableStyles, ...props }, ref) => {
     return (
         <div
             {...props}
diff --git a/src/Calendar/Calendar.js b/src/Calendar/Calendar.js
index e5da17481..6d22de465 100644
--- a/src/Calendar/Calendar.js
+++ b/src/Calendar/Calendar.js
@@ -545,7 +545,6 @@ class Calendar extends Component {
 
     render() {
         const {
-            customStyles,
             enableRangeSelection,
             disableStyles,
             disableWeekends,
diff --git a/src/ComboboxInput/ComboboxInput.js b/src/ComboboxInput/ComboboxInput.js
index 929b54bc7..1150719a5 100644
--- a/src/ComboboxInput/ComboboxInput.js
+++ b/src/ComboboxInput/ComboboxInput.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const ComboboxInput = React.forwardRef(({ placeholder, menu, compact, className, customStyles, disableStyles, popoverProps, inputProps, buttonProps, ...props }, ref) => {
+const ComboboxInput = React.forwardRef(({ placeholder, menu, compact, className, disableStyles, popoverProps, inputProps, buttonProps, ...props }, ref) => {
     const comboboxPopoverClasses = classnames(
         'fd-input-group'
     );
diff --git a/src/DatePicker/DatePicker.js b/src/DatePicker/DatePicker.js
index 9b7cff119..912f4ef65 100644
--- a/src/DatePicker/DatePicker.js
+++ b/src/DatePicker/DatePicker.js
@@ -286,7 +286,6 @@ class DatePicker extends Component {
             buttonProps,
             className,
             compact,
-            customStyles,
             disableAfterDate,
             disableBeforeDate,
             disabledDates,
@@ -336,7 +335,7 @@ class DatePicker extends Component {
                                 <Button {...buttonProps}
                                     className='fd-input-group__button'
                                     compact={compact}
-                                    disableStyles={disableStyles || customStyles}
+                                    disableStyles={disableStyles}
                                     glyph='calendar'
                                     onClick={() => this.openCalendar()}
                                     option='light' />
@@ -357,7 +356,7 @@ class DatePicker extends Component {
                             disableBeforeDate={disableBeforeDate}
                             disableFutureDates={disableFutureDates}
                             disablePastDates={disablePastDates}
-                            disableStyles={disableStyles || customStyles}
+                            disableStyles={disableStyles}
                             disableWeekday={disableWeekday}
                             disableWeekends={disableWeekends}
                             disabledDates={disabledDates}
diff --git a/src/Dropdown/Dropdown.js b/src/Dropdown/Dropdown.js
index 90e837812..3ea89b1fa 100644
--- a/src/Dropdown/Dropdown.js
+++ b/src/Dropdown/Dropdown.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Dropdown = React.forwardRef(({ children, className, customStyles, disableStyles, standard, ...props }, ref) => {
+const Dropdown = React.forwardRef(({ children, className, disableStyles, standard, ...props }, ref) => {
 
     const dropdownClasses = classnames(
         'fd-dropdown',
diff --git a/src/Forms/Checkbox.js b/src/Forms/Checkbox.js
index 3ca5f7506..50942110a 100644
--- a/src/Forms/Checkbox.js
+++ b/src/Forms/Checkbox.js
@@ -15,7 +15,7 @@ const getCheckStatus = (checked, indeterminate) => {
     }
 };
 
-const Checkbox = React.forwardRef(({ checked, className, customStyles, defaultChecked, disabled, disableStyles, id, indeterminate, inline, inputProps, labelProps, name, onChange, value, ...props }, ref) => {
+const Checkbox = React.forwardRef(({ checked, className, defaultChecked, disabled, disableStyles, id, indeterminate, inline, inputProps, labelProps, name, onChange, value, ...props }, ref) => {
 
     const inputEl = useRef();
 
diff --git a/src/Forms/FormFieldset.js b/src/Forms/FormFieldset.js
index b6b695058..9bf18d8e0 100644
--- a/src/Forms/FormFieldset.js
+++ b/src/Forms/FormFieldset.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormFieldset = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
+const FormFieldset = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
     const formFieldsetClasses = classnames(
         'fd-fieldset',
         className
diff --git a/src/Forms/FormInput.js b/src/Forms/FormInput.js
index d37bb5445..30d30562d 100644
--- a/src/Forms/FormInput.js
+++ b/src/Forms/FormInput.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormInput = React.forwardRef(({ state, className, compact, disabled, id, name, placeholder, readOnly, type, value, customStyles, disableStyles, ...props }, ref) => {
+const FormInput = React.forwardRef(({ state, className, compact, disabled, id, name, placeholder, readOnly, type, value, disableStyles, ...props }, ref) => {
     const formInputClasses = classnames(
         'fd-input',
         {
diff --git a/src/Forms/FormItem.js b/src/Forms/FormItem.js
index 03f791135..85243d909 100644
--- a/src/Forms/FormItem.js
+++ b/src/Forms/FormItem.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormItem = React.forwardRef(({ isInline, children, className, customStyles, disableStyles, ...props }, ref) => {
+const FormItem = React.forwardRef(({ isInline, children, className, disableStyles, ...props }, ref) => {
     const formItemClasses = classnames(
         'fd-form-item',
         {
diff --git a/src/Forms/FormLabel.js b/src/Forms/FormLabel.js
index 9373765e0..29be9639e 100644
--- a/src/Forms/FormLabel.js
+++ b/src/Forms/FormLabel.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormLabel = React.forwardRef(({ required, children, className, disabled, customStyles, disableStyles, ...props }, ref) => {
+const FormLabel = React.forwardRef(({ required, children, className, disabled, disableStyles, ...props }, ref) => {
     const formLabelClasses = classnames(
         'fd-form-label',
         { 'is-disabled': disabled },
diff --git a/src/Forms/FormLegend.js b/src/Forms/FormLegend.js
index 187aecf19..b8c8b4265 100644
--- a/src/Forms/FormLegend.js
+++ b/src/Forms/FormLegend.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormLegend = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
+const FormLegend = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
     const formLegendClasses = classnames(
         'fd-fieldset__legend',
         className
diff --git a/src/Forms/FormMessage.js b/src/Forms/FormMessage.js
index b3b9d1f5c..2a323e6b3 100644
--- a/src/Forms/FormMessage.js
+++ b/src/Forms/FormMessage.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormMessage = React.forwardRef(({ type, children, className, customStyles, disableStyles, ...props }, ref) => {
+const FormMessage = React.forwardRef(({ type, children, className, disableStyles, ...props }, ref) => {
     const formMessageClasses = classnames(
         'fd-form-message',
         {
diff --git a/src/Forms/FormRadioGroup.js b/src/Forms/FormRadioGroup.js
index 14ecf6d78..333b87e6f 100644
--- a/src/Forms/FormRadioGroup.js
+++ b/src/Forms/FormRadioGroup.js
@@ -11,7 +11,7 @@ class FormRadioGroup extends Component {
     }
 
     render() {
-        const { children, customStyles, disabled, disableStyles, inline, onChange, ...props } = this.props;
+        const { children, disabled, disableStyles, inline, onChange, ...props } = this.props;
 
         return (
             <div
diff --git a/src/Forms/FormRadioItem.js b/src/Forms/FormRadioItem.js
index c066fbee1..0107e5d49 100644
--- a/src/Forms/FormRadioItem.js
+++ b/src/Forms/FormRadioItem.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormRadioItem = React.forwardRef(({ checked, children, className, customStyles, defaultChecked, disabled, disableStyles, id, inline, inputProps, labelProps, name, value, ...props }, ref) => {
+const FormRadioItem = React.forwardRef(({ checked, children, className, defaultChecked, disabled, disableStyles, id, inline, inputProps, labelProps, name, value, ...props }, ref) => {
 
     return (
         <FormItem
diff --git a/src/Forms/FormSelect.js b/src/Forms/FormSelect.js
index de438af61..595a31215 100644
--- a/src/Forms/FormSelect.js
+++ b/src/Forms/FormSelect.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormSelect = React.forwardRef(({ disabled, children, className, customStyles, disableStyles, ...props }, ref) => {
+const FormSelect = React.forwardRef(({ disabled, children, className, disableStyles, ...props }, ref) => {
     const formSelectClasses = classnames(
         'fd-form-select',
         className
diff --git a/src/Forms/FormSet.js b/src/Forms/FormSet.js
index 13a218015..766c05c99 100644
--- a/src/Forms/FormSet.js
+++ b/src/Forms/FormSet.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormSet = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
+const FormSet = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
     const formSetClasses = classnames(
         'fd-form-group',
         className
diff --git a/src/Forms/FormTextarea.js b/src/Forms/FormTextarea.js
index 79564f1d7..045d346c0 100644
--- a/src/Forms/FormTextarea.js
+++ b/src/Forms/FormTextarea.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormTextarea = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
+const FormTextarea = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
     const formTextAreaClasses = classnames(
         'fd-textarea',
         className
diff --git a/src/Icon/Icon.js b/src/Icon/Icon.js
index 0bfc3be79..bd61589fd 100644
--- a/src/Icon/Icon.js
+++ b/src/Icon/Icon.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Icon = React.forwardRef(({ glyph, size, className, customStyles, disableStyles, ...props }, ref) => {
+const Icon = React.forwardRef(({ glyph, size, className, disableStyles, ...props }, ref) => {
     const iconClasses = classnames(
         {
             [`sap-icon--${glyph}`]: !!glyph,
diff --git a/src/Identifier/Identifier.js b/src/Identifier/Identifier.js
index c5b42073f..1efbc5896 100644
--- a/src/Identifier/Identifier.js
+++ b/src/Identifier/Identifier.js
@@ -5,7 +5,7 @@ import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 import { IDENTIFIER_MODIFIERS, IDENTIFIER_SIZES } from '../utils/constants';
 
-const Identifier = React.forwardRef(({ glyph, size, modifier, color, label, backgroundImageUrl, children, className, customStyles, disableStyles, ...props }, ref) => {
+const Identifier = React.forwardRef(({ glyph, size, modifier, color, label, backgroundImageUrl, children, className, disableStyles, ...props }, ref) => {
     const styles = {
         backgroundImage: `url(${backgroundImageUrl})`
     };
diff --git a/src/Image/Image.js b/src/Image/Image.js
index 9ad63e316..e422c4b9e 100644
--- a/src/Image/Image.js
+++ b/src/Image/Image.js
@@ -4,7 +4,7 @@ import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 import { IMAGE_SIZES, IMAGE_TYPES } from '../utils/constants';
 
-const Image = React.forwardRef(({ size, type, photo, className, customStyles, disableStyles, ...props }, ref) => {
+const Image = React.forwardRef(({ size, type, photo, className, disableStyles, ...props }, ref) => {
     const imageClasses = classnames(
         {
             [`fd-image--${size}`]: !!size,
diff --git a/src/InlineHelp/InlineHelp.js b/src/InlineHelp/InlineHelp.js
index 61fdaebd0..5f3d38847 100644
--- a/src/InlineHelp/InlineHelp.js
+++ b/src/InlineHelp/InlineHelp.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const InlineHelp = React.forwardRef(({ text, placement, className, contentClassName, customStyles, disableStyles, ...props }, ref) => {
+const InlineHelp = React.forwardRef(({ text, placement, className, contentClassName, disableStyles, ...props }, ref) => {
 
     const inlineHelpClasses = classnames(
         'fd-inline-help',
diff --git a/src/InputGroup/FormGroup.js b/src/InputGroup/FormGroup.js
index c6e1db3b6..992725a3c 100644
--- a/src/InputGroup/FormGroup.js
+++ b/src/InputGroup/FormGroup.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const FormGroup = React.forwardRef(({ children, customStyles, disableStyles, ...props }, ref) => {
+const FormGroup = React.forwardRef(({ children, disableStyles, ...props }, ref) => {
     return (<div {...props} className='fd-form-group'
         ref={ref}>{children}</div>);
 });
diff --git a/src/InputGroup/InputGroup.js b/src/InputGroup/InputGroup.js
index a2d071c49..1bb9375c0 100644
--- a/src/InputGroup/InputGroup.js
+++ b/src/InputGroup/InputGroup.js
@@ -62,7 +62,6 @@ class InputGroup extends Component {
             children,
             className,
             compact,
-            customStyles,
             disableStyles,
             glyph,
             inputClassName,
diff --git a/src/LayoutGrid/LayoutGrid.js b/src/LayoutGrid/LayoutGrid.js
index bf86d3c23..370d97c95 100644
--- a/src/LayoutGrid/LayoutGrid.js
+++ b/src/LayoutGrid/LayoutGrid.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const LayoutGrid = React.forwardRef(({ nogap, cols, children, className, colSpan, customStyles, disableStyles, ...props }, ref) => {
+const LayoutGrid = React.forwardRef(({ nogap, cols, children, className, colSpan, disableStyles, ...props }, ref) => {
 
     const layoutGridClasses = classnames(
         'fd-layout-grid',
diff --git a/src/Link/Link.js b/src/Link/Link.js
index 8b71b2d13..3756e1652 100644
--- a/src/Link/Link.js
+++ b/src/Link/Link.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Link = React.forwardRef(({ className, children, disabled, customStyles, disableStyles, ...props }, ref) => {
+const Link = React.forwardRef(({ className, children, disabled, disableStyles, ...props }, ref) => {
     const imageClasses = classnames(
         'fd-link',
         { 'is-disabled': !!disabled },
diff --git a/src/ListGroup/ListGroup.js b/src/ListGroup/ListGroup.js
index cbbb08f5b..f2d26c829 100644
--- a/src/ListGroup/ListGroup.js
+++ b/src/ListGroup/ListGroup.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const ListGroup = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
+const ListGroup = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
     const listGroupClasses = classnames(
         'fd-list-group',
         className
diff --git a/src/LocalizationEditor/LocalizationEditor.js b/src/LocalizationEditor/LocalizationEditor.js
index 51876e960..ba682cc38 100644
--- a/src/LocalizationEditor/LocalizationEditor.js
+++ b/src/LocalizationEditor/LocalizationEditor.js
@@ -11,7 +11,7 @@ import withStyles from '../utils/WithStyles/WithStyles';
 
 
 const LocalizationEditor = React.forwardRef(({ control, menu, id, compact, textarea, className, inputClassName, listProps, popoverProps,
-    customStyles, disableStyles, ...props }, ref) => {
+    disableStyles, ...props }, ref) => {
 
     const localizationEditorClasses = classnames(
         'fd-localization-editor',
diff --git a/src/Menu/Menu.js b/src/Menu/Menu.js
index 2efbde615..7adcea162 100644
--- a/src/Menu/Menu.js
+++ b/src/Menu/Menu.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Menu = React.forwardRef(({ addonBefore, children, className, customStyles, disableStyles, ...props }, ref) => {
+const Menu = React.forwardRef(({ addonBefore, children, className, disableStyles, ...props }, ref) => {
     const menuClasses = classnames(
         'fd-menu',
         {
diff --git a/src/Modal/Modal.js b/src/Modal/Modal.js
index f8ff937c4..7281fe9e7 100644
--- a/src/Modal/Modal.js
+++ b/src/Modal/Modal.js
@@ -39,7 +39,6 @@ class Modal extends Component {
             className,
             closeProps,
             contentProps,
-            customStyles,
             disableStyles,
             headerProps,
             headingLevel,
diff --git a/src/MultiInput/MultiInput.js b/src/MultiInput/MultiInput.js
index 6b31e325b..81433b4d2 100644
--- a/src/MultiInput/MultiInput.js
+++ b/src/MultiInput/MultiInput.js
@@ -109,7 +109,6 @@ class MultiInput extends Component {
             buttonProps,
             compact,
             className,
-            customStyles,
             disableStyles,
             data,
             listProps,
diff --git a/src/Pagination/Pagination.js b/src/Pagination/Pagination.js
index 54b3328b4..ba31746e2 100644
--- a/src/Pagination/Pagination.js
+++ b/src/Pagination/Pagination.js
@@ -81,7 +81,6 @@ class Pagination extends Component {
             displayTotal,
             totalText,
             className,
-            customStyles,
             disableStyles,
             linkProps,
             localizedText,
diff --git a/src/Panel/Panel.js b/src/Panel/Panel.js
index 027452e7a..73211530a 100644
--- a/src/Panel/Panel.js
+++ b/src/Panel/Panel.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Panel = React.forwardRef(({ colSpan, children, className, customStyles, disableStyles, ...props }, ref) => {
+const Panel = React.forwardRef(({ colSpan, children, className, disableStyles, ...props }, ref) => {
 
     const panelClasses = classnames(
         'fd-panel',
diff --git a/src/Popover/Popover.js b/src/Popover/Popover.js
index c950bf631..8c550e3f8 100644
--- a/src/Popover/Popover.js
+++ b/src/Popover/Popover.js
@@ -33,7 +33,6 @@ class Popover extends Component {
 
     render() {
         const {
-            customStyles,
             disableEdgeDetection,
             disableStyles,
             onClickOutside,
diff --git a/src/SearchInput/SearchInput.js b/src/SearchInput/SearchInput.js
index d131ed565..62fc0f810 100644
--- a/src/SearchInput/SearchInput.js
+++ b/src/SearchInput/SearchInput.js
@@ -115,7 +115,6 @@ class SearchInput extends Component {
 
     render() {
         const {
-            customStyles,
             disableStyles,
             placeholder,
             inShellbar,
diff --git a/src/SideNavigation/SideNav.js b/src/SideNavigation/SideNav.js
index 9b3ab99b6..1c72595af 100644
--- a/src/SideNavigation/SideNav.js
+++ b/src/SideNavigation/SideNav.js
@@ -29,7 +29,7 @@ class SideNav extends Component {
     }
 
     render() {
-        const { onItemSelect, children, className, customStyles, disableStyles, icons, selectedId, ...rest } = this.props;
+        const { onItemSelect, children, className, disableStyles, icons, selectedId, ...rest } = this.props;
 
         const sideNavClasses = classnames(
             className,
diff --git a/src/Table/Table.js b/src/Table/Table.js
index 2760f2a71..c3283fccd 100644
--- a/src/Table/Table.js
+++ b/src/Table/Table.js
@@ -5,7 +5,7 @@ import withStyles from '../utils/WithStyles/WithStyles';
 
 const Table = React.forwardRef(({ headers, tableData, className, tableBodyClassName,
     tableBodyProps, tableBodyRowProps, tableCellClassName, tableHeaderClassName, tableHeaderProps,
-    tableHeaderRowClassName, tableHeaderRowProps, tableRowClassName, customStyles, disableStyles, ...props }, ref) => {
+    tableHeaderRowClassName, tableHeaderRowProps, tableRowClassName, disableStyles, ...props }, ref) => {
 
     const tableClasses = classnames(
         'fd-table',
diff --git a/src/Tabs/Tab.js b/src/Tabs/Tab.js
index ad2723635..8267e659b 100644
--- a/src/Tabs/Tab.js
+++ b/src/Tabs/Tab.js
@@ -5,7 +5,7 @@ import withStyles from '../utils/WithStyles/WithStyles';
 
 
 const Tab = React.forwardRef(({ title, disabled, glyph, id, selected, onClick,
-    tabContentProps, linkProps, index, className, customStyles, disableStyles, ...props }, ref) => {
+    tabContentProps, linkProps, index, className, disableStyles, ...props }, ref) => {
 
     const tabClasses = classnames(
         className,
diff --git a/src/Tabs/TabGroup.js b/src/Tabs/TabGroup.js
index e55945ae5..26fb6f4d2 100644
--- a/src/Tabs/TabGroup.js
+++ b/src/Tabs/TabGroup.js
@@ -69,7 +69,6 @@ class TabGroup extends Component {
         const {
             children,
             className,
-            customStyles,
             disableStyles,
             selectedIndex,
             tabGroupProps,
diff --git a/src/Tile/Tile.js b/src/Tile/Tile.js
index 642d28ed9..0b39a8c3b 100644
--- a/src/Tile/Tile.js
+++ b/src/Tile/Tile.js
@@ -11,7 +11,6 @@ const Tile = React.forwardRef(({
     backgroundImage,
     children,
     className,
-    customStyles,
     disableStyles,
     productTile,
     ...rest
diff --git a/src/Time/Time.js b/src/Time/Time.js
index 197e6cc84..1a810922e 100644
--- a/src/Time/Time.js
+++ b/src/Time/Time.js
@@ -57,7 +57,6 @@ class Time extends Component {
     // };
     render() {
         const {
-            customStyles,
             disableStyles,
             localizedText,
             showHour,
diff --git a/src/TimePicker/TimePicker.js b/src/TimePicker/TimePicker.js
index dbd37313b..a43751c12 100644
--- a/src/TimePicker/TimePicker.js
+++ b/src/TimePicker/TimePicker.js
@@ -90,7 +90,6 @@ class TimePicker extends Component {
     // };
     render() {
         const {
-            customStyles,
             disableStyles,
             popoverProps,
             id,
diff --git a/src/Toggle/Toggle.js b/src/Toggle/Toggle.js
index 3a652802a..6a64abc64 100644
--- a/src/Toggle/Toggle.js
+++ b/src/Toggle/Toggle.js
@@ -20,7 +20,7 @@ class Toggle extends React.Component {
     }
 
     render() {
-        const { size, id, checked, customStyles, disabled, disableStyles, children, className, labelProps, inputProps, onChange, ...rest } = this.props;
+        const { size, id, checked, disabled, disableStyles, children, className, labelProps, inputProps, onChange, ...rest } = this.props;
 
         const spanClasses = classnames(
             'fd-toggle',
diff --git a/src/Token/Token.js b/src/Token/Token.js
index 5039cb665..32a55df0f 100644
--- a/src/Token/Token.js
+++ b/src/Token/Token.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import withStyles from '../utils/WithStyles/WithStyles';
 
-const Token = React.forwardRef(({ children, className, customStyles, disableStyles, ...props }, ref) => {
+const Token = React.forwardRef(({ children, className, disableStyles, ...props }, ref) => {
 
     const tokenClasses = classnames(
         'fd-token',
diff --git a/src/TreeView/TreeView.js b/src/TreeView/TreeView.js
index 06a6a2183..7c1102199 100644
--- a/src/TreeView/TreeView.js
+++ b/src/TreeView/TreeView.js
@@ -105,7 +105,6 @@ class TreeView extends Component {
 
     render() {
         const {
-            customStyles,
             disableStyles,
             children,
             isExpandAll: isExpandAllProp,
diff --git a/src/utils/WithStyles/TestComponent.js b/src/utils/WithStyles/TestComponent.js
index 2ec4aa257..1b1868645 100644
--- a/src/utils/WithStyles/TestComponent.js
+++ b/src/utils/WithStyles/TestComponent.js
@@ -8,7 +8,6 @@ const _SubTestComponent = () => {
 
 const TestComponent = React.forwardRef((props, ref) => {
     const {
-        customStyles,
         disableStyles,
         ...otherProps
     } = props;