From ea9de8a518b01fa4257d367418e95a4ed2897717 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Mon, 19 Jun 2017 11:59:46 +0200
Subject: [PATCH] Replace React.Component<(.*), (any|void|\{\}|null)> by
 React.Component<$1>

+ many manual adjustments
---
 types/alt/index.d.ts                          |   2 +-
 types/aphrodite/aphrodite-tests.tsx           |   2 +-
 types/chai-enzyme/chai-enzyme-tests.tsx       |   2 +-
 types/draft-js/draft-js-tests.tsx             |   2 +-
 types/draft-js/index.d.ts                     |   4 +-
 types/enzyme/index.d.ts                       |   4 +-
 .../fixed-data-table-tests.tsx                |  10 +-
 types/fixed-data-table/index.d.ts             |   8 +-
 types/google-map-react/index.d.ts             |   2 +-
 types/griddle-react/index.d.ts                |   2 +-
 .../test/CustomColumnComponent.tsx            |   4 +-
 .../test/CustomFilterComponent.tsx            |   4 +-
 .../test/CustomHeaderComponent.tsx            |   4 +-
 types/griddle-react/test/index.tsx            |   2 +-
 types/halogen/index.d.ts                      |  32 +--
 types/halogen/test/clip-loader.tsx            |   4 +-
 types/halogen/test/fade-loader.tsx            |   4 +-
 types/halogen/test/pacman-loader.tsx          |   4 +-
 types/halogen/test/rotate-loader.tsx          |   4 +-
 types/material-ui/index.d.ts                  | 186 +++++++++---------
 types/material-ui/material-ui-tests.tsx       |   6 +-
 types/navigation-react/index.d.ts             |   6 +-
 types/radium/index.d.ts                       |   4 +-
 types/radium/radium-tests.tsx                 |   6 +-
 types/rc-select/index.d.ts                    |   6 +-
 types/rc-select/rc-select-tests.ts            |   2 +-
 types/rc-slider/index.d.ts                    |   6 +-
 types/rc-tooltip/index.d.ts                   |   2 +-
 types/rc-tree/index.d.ts                      |   4 +-
 .../react-addons-shallow-compare-tests.tsx    |   2 +-
 types/react-addons-test-utils/index.d.ts      |  30 +--
 types/react-autosuggest/index.d.ts            |   2 +-
 types/react-big-calendar/index.d.ts           |   2 +-
 types/react-body-classname/index.d.ts         |   2 +-
 .../react-bootstrap-date-picker-tests.tsx     |   2 +-
 .../index.d.ts                                |   2 +-
 .../react-bootstrap-daterangepicker-tests.ts  |   2 +-
 .../react-bootstrap-table-tests.tsx           |   8 +-
 types/react-bootstrap/index.d.ts              | 168 ++++++++--------
 .../react-bootstrap/react-bootstrap-tests.tsx |   2 +-
 .../react-breadcrumbs-tests.tsx               |   2 +-
 types/react-bytesize-icons/index.d.ts         |   2 +-
 .../react-calendar-timeline-tests.tsx         |   2 +-
 types/react-chartjs-2/index.d.ts              |   2 +-
 .../react-chartjs-2/test/dynamic-doughnut.tsx |   2 +-
 types/react-chartjs-2/test/index.tsx          |   2 +-
 types/react-codemirror/index.d.ts             |   2 +-
 .../react-codemirror-tests.tsx                |   2 +-
 .../lib/components/alpha/Alpha.d.ts           |   2 +-
 .../lib/components/block/Block.d.ts           |   2 +-
 .../lib/components/chrome/Chrome.d.ts         |   2 +-
 .../lib/components/circle/Circle.d.ts         |   2 +-
 .../lib/components/common/Alpha.d.ts          |   2 +-
 .../lib/components/common/Checkboard.d.ts     |   2 +-
 .../lib/components/common/EditableInput.d.ts  |   2 +-
 .../lib/components/common/Hue.d.ts            |   2 +-
 .../lib/components/common/Saturation.d.ts     |   2 +-
 .../lib/components/compact/Compact.d.ts       |   2 +-
 .../lib/components/github/Github.d.ts         |   2 +-
 types/react-color/lib/components/hue/Hue.d.ts |   2 +-
 .../lib/components/material/Material.d.ts     |   2 +-
 .../lib/components/photoshop/Photoshop.d.ts   |   2 +-
 .../lib/components/sketch/Sketch.d.ts         |   2 +-
 .../lib/components/slider/Slider.d.ts         |   2 +-
 .../lib/components/swatches/Swatches.d.ts     |   2 +-
 .../lib/components/twitter/Twitter.d.ts       |   2 +-
 types/react-copy-to-clipboard/index.d.ts      |   2 +-
 .../react-copy-to-clipboard-tests.tsx         |   2 +-
 types/react-cropper/index.d.ts                |   2 +-
 types/react-cropper/react-cropper-tests.tsx   |   2 +-
 .../react-css-modules-tests.tsx               |   6 +-
 types/react-custom-scrollbars/index.d.ts      |   2 +-
 types/react-custom-scrollbars/v3/index.d.ts   |   2 +-
 types/react-data-grid/index.d.ts              |  30 +--
 types/react-data-grid/v1/index.d.ts           |  28 +--
 types/react-datagrid/index.d.ts               |   2 +-
 types/react-datagrid/react-datagrid-tests.tsx |   4 +-
 types/react-daterange-picker/index.d.ts       |   4 +-
 .../react-daterange-picker-tests.tsx          |   2 +-
 types/react-dates/react-dates-tests.tsx       |  10 +-
 .../react-dnd-html5-backend-tests.ts          |  10 +-
 types/react-dnd/index.d.ts                    |   8 +-
 types/react-dnd/react-dnd-tests.ts            |  10 +-
 types/react-dom/index.d.ts                    |   8 +-
 types/react-dom/react-dom-tests.ts            |   2 +-
 types/react-dom/test-utils/index.d.ts         |  30 +--
 types/react-dropzone/react-dropzone-tests.tsx |   2 +-
 types/react-easy-chart/index.d.ts             |  12 +-
 .../react-easy-chart-tests.tsx                | 162 +++++++--------
 types/react-event-listener/index.d.ts         |   2 +-
 types/react-fa/index.d.ts                     |   4 +-
 types/react-fa/react-fa-tests.tsx             |   2 +-
 types/react-facebook-login/index.d.ts         |   2 +-
 .../react-facebook-login-tests.tsx            |   4 +-
 types/react-faux-dom/react-faux-dom-tests.tsx |   2 +-
 types/react-file-input/index.d.ts             |   2 +-
 .../react-file-input-tests.tsx                |   2 +-
 types/react-file-reader-input/index.d.ts      |   2 +-
 .../react-file-reader-input-tests.tsx         |   2 +-
 types/react-flatpickr/index.d.ts              |   2 +-
 types/react-flex/index.d.ts                   |   4 +-
 types/react-flexr/index.d.ts                  |   4 +-
 types/react-flexr/react-flexr-tests.tsx       |   8 +-
 types/react-flip-move/index.d.ts              |   2 +-
 .../react-flip-move/react-flip-move-tests.tsx |   8 +-
 types/react-fontawesome/index.d.ts            |   2 +-
 .../react-fontawesome-tests.tsx               |   2 +-
 types/react-gravatar/index.d.ts               |   2 +-
 types/react-gravatar/react-gravatar-tests.tsx |   6 +-
 types/react-grid-layout/index.d.ts            |   4 +-
 .../react-grid-layout-tests.tsx               |   6 +-
 types/react-hamburger-menu/index.d.ts         |   2 +-
 types/react-helmet/index.d.ts                 |   4 +-
 types/react-helmet/v4/index.d.ts              |   4 +-
 types/react-highlight-words/index.d.ts        |   2 +-
 .../react-highlighter-tests.tsx               |   2 +-
 types/react-holder/index.d.ts                 |   2 +-
 types/react-holder/react-holder-tests.tsx     |   2 +-
 types/react-hot-loader/index.d.ts             |   2 +-
 .../react-hot-loader-tests.tsx                |   4 +-
 types/react-i18next/index.d.ts                |   4 +-
 types/react-i18next/react-i18next-tests.tsx   |   8 +-
 types/react-imageloader/index.d.ts            |   2 +-
 types/react-infinite-scroller/index.d.ts      |   2 +-
 .../react-infinite-scroller-tests.tsx         |   4 +-
 types/react-infinite/index.d.ts               |   2 +-
 types/react-infinite/react-infinite-tests.tsx |   8 +-
 types/react-input-mask/index.d.ts             |   2 +-
 types/react-intl/react-intl-tests.tsx         |   4 +-
 types/react-intl/v1/react-intl-tests.tsx      |   4 +-
 .../react-json-pretty-tests.tsx               |   2 +-
 types/react-json-tree/index.d.ts              |   2 +-
 types/react-jsonschema-form/index.d.ts        |   2 +-
 types/react-lazyload/index.d.ts               |   2 +-
 types/react-leaflet/index.d.ts                |   6 +-
 types/react-loadable/react-loadable-tests.tsx |   2 +-
 types/react-loader/index.d.ts                 |   2 +-
 types/react-loader/react-loader-tests.tsx     |   2 +-
 .../react-maskedinput-tests.tsx               |   2 +-
 types/react-mdl/index.d.ts                    |   4 +-
 types/react-measure/index.d.ts                |   2 +-
 types/react-measure/react-measure-tests.tsx   |   4 +-
 types/react-mixin/react-mixin-tests.tsx       |   8 +-
 types/react-modal/index.d.ts                  |   2 +-
 types/react-modal/react-modal-tests.tsx       |   2 +-
 types/react-monaco-editor/index.d.ts          |   2 +-
 .../react-monaco-editor-tests.tsx             |   2 +-
 types/react-motion-slider/index.d.ts          |   2 +-
 .../react-motion-slider-tests.tsx             |   2 +-
 types/react-motion/index.d.ts                 |   6 +-
 types/react-motion/react-motion-tests.tsx     |   6 +-
 types/react-native-datepicker/index.d.ts      |   2 +-
 types/react-native-drawer-layout/index.d.ts   |   2 +-
 types/react-native-drawer/index.d.ts          |   2 +-
 .../react-native-goby-tests.tsx               |   2 +-
 .../index.d.ts                                |   2 +-
 ...react-native-scrollable-tab-view-tests.tsx |   4 +-
 types/react-native-snap-carousel/index.d.ts   |   2 +-
 .../react-native-snap-carousel-tests.tsx      |   2 +-
 .../react-native-sortable-list-tests.tsx      |   2 +-
 .../react-native-swiper-tests.tsx             |   2 +-
 types/react-native-video/index.d.ts           |   2 +-
 .../react-native-video-tests.tsx              |   2 +-
 types/react-native/index.d.ts                 |   4 +-
 types/react-native/test/index.tsx             |   8 +-
 types/react-native/test/init-example.tsx      |   2 +-
 .../index.d.ts                                |   2 +-
 .../react-notification-system-redux-tests.tsx |   2 +-
 .../react-notification-system-tests.tsx       |   2 +-
 .../react-onclickoutside-tests.tsx            |   2 +-
 types/react-onsenui/index.d.ts                |  14 +-
 types/react-overlays/index.d.ts               |   6 +-
 .../react-overlays/lib/RootCloseWrapper.d.ts  |   2 +-
 types/react-overlays/react-overlays-tests.tsx |   4 +-
 types/react-paginate/react-paginate-tests.tsx |   2 +-
 types/react-pointable/index.d.ts              |   2 +-
 types/react-portal/react-portal-tests.tsx     |   4 +-
 .../react-props-decorators-tests.ts           |   2 +-
 types/react-recaptcha/index.d.ts              |   2 +-
 types/react-redux-i18n/index.d.ts             |   4 +-
 .../react-redux-i18n-tests.tsx                |   8 +-
 types/react-redux-toastr/index.d.ts           |   4 +-
 types/react-redux/index.d.ts                  |   2 +-
 types/react-redux/react-redux-tests.tsx       |  18 +-
 types/react-relay/react-relay-tests.tsx       |   4 +-
 types/react-responsive/index.d.ts             |   2 +-
 .../react-responsive-tests.tsx                |   2 +-
 .../react-router-bootstrap-tests.tsx          |   2 +-
 types/react-router-dom/index.d.ts             |   8 +-
 types/react-router-redux/index.d.ts           |   2 +-
 types/react-router/index.d.ts                 |  14 +-
 types/react-router/test/ModalGallery.tsx      |   2 +-
 .../react-router/test/NavigateWithContext.tsx |   2 +-
 types/react-router/test/StaticRouter.tsx      |   2 +-
 types/react-router/v2/lib/withRouter.d.ts     |   2 +-
 types/react-router/v3/react-router-tests.tsx  |   8 +-
 .../modules/components/Button.d.ts            |   2 +-
 .../modules/components/Element.d.ts           |   2 +-
 .../react-scroll/modules/components/Link.d.ts |   2 +-
 .../react-scroll/test/react-scroll-tests.tsx  |   2 +-
 types/react-scrollbar/index.d.ts              |   2 +-
 types/react-select/index.d.ts                 |   8 +-
 types/react-select/react-select-tests.tsx     |  12 +-
 types/react-side-effect/index.d.ts            |   2 +-
 .../react-side-effect-tests.ts                |   2 +-
 types/react-sidebar/index.d.ts                |   2 +-
 types/react-slick/react-slick-tests.tsx       |   4 +-
 types/react-smooth-scrollbar/index.d.ts       |   2 +-
 .../react-smooth-scrollbar-tests.tsx          |   2 +-
 .../react-sortable-hoc-tests.tsx              |   2 +-
 .../react-split-pane-tests.tsx                |   2 +-
 types/react-svg-pan-zoom/index.d.ts           |   4 +-
 .../react-svg-pan-zoom-tests.tsx              |   2 +-
 types/react-swipeable/index.d.ts              |   2 +-
 .../react-swipeable/react-swipeable-tests.tsx |   2 +-
 types/react-syntax-highlighter/index.d.ts     |   2 +-
 types/react-tabs/react-tabs-tests.ts          |   2 +-
 .../react-test-renderer-tests.ts              |   2 +-
 types/react-tether/index.d.ts                 |   2 +-
 types/react-textarea-autosize/index.d.ts      |   2 +-
 .../react-textarea-autosize-tests.tsx         |   2 +-
 types/react-toggle/index.d.ts                 |   2 +-
 types/react-toggle/react-toggle-tests.tsx     |   2 +-
 .../CSSTransitionGroup.d.ts                   |   2 +-
 .../TransitionGroup.d.ts                      |   2 +-
 .../react-transition-group-tests.tsx          |   2 +-
 types/react-virtualized-select/index.d.ts     |   2 +-
 .../dist/es/CellMeasurer.d.ts                 |   2 +-
 .../react-virtualized/dist/es/Collection.d.ts |   2 +-
 .../dist/es/ColumnSizer.d.ts                  |   2 +-
 .../dist/es/InfiniteLoader.d.ts               |   2 +-
 types/react-virtualized/dist/es/List.d.ts     |   2 +-
 types/react-virtualized/dist/es/Table.d.ts    |   4 +-
 .../react-virtualized-tests.tsx               |  12 +-
 types/react-widgets/react-widgets-tests.tsx   |   2 +-
 types/react/test/index.ts                     |   2 +-
 types/reactstrap/reactstrap-tests.tsx         |  68 +++----
 types/rebass/rebass-tests.tsx                 |   4 +-
 types/redux-devtools-dock-monitor/index.d.ts  |   2 +-
 types/redux-devtools-log-monitor/index.d.ts   |   2 +-
 types/redux-devtools/redux-devtools-tests.tsx |   4 +-
 types/redux-form/lib/Field.d.ts               |   8 +-
 types/redux-form/lib/FieldArray.d.ts          |   8 +-
 types/redux-form/lib/Fields.d.ts              |   8 +-
 types/redux-form/lib/Form.d.ts                |   2 +-
 types/redux-form/lib/FormSection.d.ts         |   2 +-
 types/redux-form/redux-form-tests.tsx         |   8 +-
 types/redux-form/v4/index.d.ts                |   2 +-
 types/redux-form/v4/redux-form-tests.tsx      |   8 +-
 types/redux-infinite-scroll/index.d.ts        |   2 +-
 .../redux-infinite-scroll-tests.tsx           |   2 +-
 types/redux-ui/redux-ui-tests.ts              |   2 +-
 types/rrc/index.d.ts                          |   8 +-
 types/rrc/rrc-tests.tsx                       |  10 +-
 types/spectacle/index.d.ts                    |  48 ++---
 types/spectacle/spectacle-tests.tsx           |   2 +-
 types/storybook__react/index.d.ts             |   2 +-
 types/victory/index.d.ts                      |  24 +--
 258 files changed, 828 insertions(+), 828 deletions(-)

diff --git a/types/alt/index.d.ts b/types/alt/index.d.ts
index 20cd145c82..2d4c6e259f 100644
--- a/types/alt/index.d.ts
+++ b/types/alt/index.d.ts
@@ -152,7 +152,7 @@ declare module "alt/AltContainer" {
     flux?:AltJS.Alt;
     transform?:(store:AltJS.AltStore<any>, actions:any) => any;
     shouldComponentUpdate?:(props:any) => boolean;
-    component?:React.Component<any, any>;
+    component?:React.Component<any>;
   }
 
   type AltContainer = React.ReactElement<ContainerProps>;
diff --git a/types/aphrodite/aphrodite-tests.tsx b/types/aphrodite/aphrodite-tests.tsx
index f3c51f899e..86ad7d8e19 100644
--- a/types/aphrodite/aphrodite-tests.tsx
+++ b/types/aphrodite/aphrodite-tests.tsx
@@ -39,7 +39,7 @@ const withFont = StyleSheet.create({
 });
 
 
-class App extends React.Component<{}, {}> {
+class App extends React.Component<{}> {
     render() {
         return <div>
             <span className={css(styles.red)}>
diff --git a/types/chai-enzyme/chai-enzyme-tests.tsx b/types/chai-enzyme/chai-enzyme-tests.tsx
index 8fc64e2711..a9b144c6c0 100644
--- a/types/chai-enzyme/chai-enzyme-tests.tsx
+++ b/types/chai-enzyme/chai-enzyme-tests.tsx
@@ -5,7 +5,7 @@ import { shallow } from "enzyme";
 
 const Test = () => <div/>;
 
-class Test2 extends React.Component<{}, {}> {
+class Test2 extends React.Component<{}> {
     render() {
         return <div/>;
     }
diff --git a/types/draft-js/draft-js-tests.tsx b/types/draft-js/draft-js-tests.tsx
index 8a3730dca8..4315611765 100644
--- a/types/draft-js/draft-js-tests.tsx
+++ b/types/draft-js/draft-js-tests.tsx
@@ -183,7 +183,7 @@ function getBlockStyle(block: ContentBlock) {
   }
 }
 
-class StyleButton extends React.Component<{key: string, active: boolean, label: string, onToggle: (blockType: string) => void, style: string}, {}> {
+class StyleButton extends React.Component<{key: string, active: boolean, label: string, onToggle: (blockType: string) => void, style: string}> {
   constructor() {
     super();
   }
diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index 960a1b4433..a3c14b73b4 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -37,7 +37,7 @@ declare namespace Draft {
              * div, and provides a wide variety of useful function props for managing the
              * state of the editor. See `DraftEditorProps` for details.
              */
-            class DraftEditor extends React.Component<DraftEditorProps, any> {
+            class DraftEditor extends React.Component<DraftEditorProps> {
                 // Force focus back onto the editor node.
                 focus(): void;
                 // Remove focus from the editor node.
@@ -162,7 +162,7 @@ declare namespace Draft {
         }
 
         namespace Components {
-            class DraftEditorBlock extends React.Component<any, any> {
+            class DraftEditorBlock extends React.Component<any> {
             }
         }
 
diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index 01ecfa90d8..2a7142d9b3 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -15,7 +15,7 @@ import { ReactElement, Component, HTMLAttributes as ReactHTMLAttributes, SVGAttr
 
 export type HTMLAttributes = ReactHTMLAttributes<{}> & ReactSVGAttributes<{}>;
 
-export class ElementClass extends Component<any, any> {
+export class ElementClass extends Component<any> {
 }
 
 /* These are purposefully stripped down versions of React.ComponentClass and React.StatelessComponent.
@@ -23,7 +23,7 @@ export class ElementClass extends Component<any, any> {
  * all specified in the implementation. TS chooses the EnzymePropSelector overload and loses the generics
  */
 export interface ComponentClass<Props> {
-    new (props?: Props, context?: any): Component<Props, any>;
+    new (props?: Props, context?: any): Component<Props>;
 }
 
 export type StatelessComponent<Props> = (props: Props, context?: any) => JSX.Element;
diff --git a/types/fixed-data-table/fixed-data-table-tests.tsx b/types/fixed-data-table/fixed-data-table-tests.tsx
index 64b622b21f..281f014888 100644
--- a/types/fixed-data-table/fixed-data-table-tests.tsx
+++ b/types/fixed-data-table/fixed-data-table-tests.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import {Table, Cell, Column, CellProps} from "fixed-data-table";
 
 // create your Table
-class MyTable1 extends React.Component<{}, {}> {
+class MyTable1 extends React.Component<{}> {
     render(): React.ReactElement<any> {
         return (
             <Table
@@ -17,7 +17,7 @@ class MyTable1 extends React.Component<{}, {}> {
 }
 
 // create your Columns
-class MyTable2 extends React.Component<{}, {}> {
+class MyTable2 extends React.Component<{}> {
     render(): React.ReactElement<any> {
         return (
             <Table
@@ -88,7 +88,7 @@ interface MyCellProps extends CellProps {
     myData: RowData[];
 }
 
-class MyTextCell extends React.Component<MyCellProps, {}> {
+class MyTextCell extends React.Component<MyCellProps> {
     render(): React.ReactElement<any> {
         const {rowIndex, field, myData} = this.props;
 
@@ -104,7 +104,7 @@ class MyTextCell extends React.Component<MyCellProps, {}> {
     }
 }
 
-class MyLinkCell extends React.Component<MyCellProps, {}> {
+class MyLinkCell extends React.Component<MyCellProps> {
     render(): React.ReactElement<any> {
         const {rowIndex, field, myData} = this.props;
         const link: string = myData[rowIndex][field];
@@ -168,7 +168,7 @@ class MyTable4 extends React.Component<{}, MyTable4State> {
 }
 
 // Listen for events
-class MyTable5 extends React.Component<{}, {}> {
+class MyTable5 extends React.Component<{}> {
     render(): React.ReactElement<any> {
         return (
             <Table
diff --git a/types/fixed-data-table/index.d.ts b/types/fixed-data-table/index.d.ts
index bf64d1caad..9eef731cf9 100644
--- a/types/fixed-data-table/index.d.ts
+++ b/types/fixed-data-table/index.d.ts
@@ -489,12 +489,12 @@ declare namespace FixedDataTable {
         columnKey?: string | number;
     }
 
-    export class Table extends React.Component<TableProps, {}> {
+    export class Table extends React.Component<TableProps> {
     }
-    export class Column extends React.Component<ColumnProps, {}> {
+    export class Column extends React.Component<ColumnProps> {
     }
-    export class ColumnGroup extends React.Component<ColumnGroupProps, {}> {
+    export class ColumnGroup extends React.Component<ColumnGroupProps> {
     }
-    export class Cell extends React.Component<CellProps, {}> {
+    export class Cell extends React.Component<CellProps> {
     }
 }
diff --git a/types/google-map-react/index.d.ts b/types/google-map-react/index.d.ts
index 0ef3f2b5bd..c1898a9e3f 100644
--- a/types/google-map-react/index.d.ts
+++ b/types/google-map-react/index.d.ts
@@ -102,7 +102,7 @@ export interface Props {
   yesIWantToUseGoogleMapApiInternals?: boolean;
 }
 
-export default class GoogleMapReact extends React.Component<Props, void> {}
+export default class GoogleMapReact extends React.Component<Props> {}
 
 export interface ChildComponentProps extends Coords {
   $hover?: boolean;
diff --git a/types/griddle-react/index.d.ts b/types/griddle-react/index.d.ts
index fb817927ce..ea40fb2130 100644
--- a/types/griddle-react/index.d.ts
+++ b/types/griddle-react/index.d.ts
@@ -162,7 +162,7 @@ export interface GriddleProps<T> {
   onRowClick?(): void;
 }
 
-declare class Griddle<T> extends React.Component<GriddleProps<T>, any> {
+declare class Griddle<T> extends React.Component<GriddleProps<T>> {
 }
 
 export default Griddle;
diff --git a/types/griddle-react/test/CustomColumnComponent.tsx b/types/griddle-react/test/CustomColumnComponent.tsx
index fff018dcfb..9b2c4887c5 100644
--- a/types/griddle-react/test/CustomColumnComponent.tsx
+++ b/types/griddle-react/test/CustomColumnComponent.tsx
@@ -12,7 +12,7 @@ interface MyCustomResult {
   test: string;
 }
 
-class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>, any> {
+class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>> {
   render() {
     const url = "speakers/" + this.props.rowData.test + "/" + this.props.data;
     return <a href={url}>{this.props.data}</a>;
@@ -50,7 +50,7 @@ const rowMetaData = {
   }
 };
 
-class CustomColumnComponentGrid extends React.Component<any, any> {
+class CustomColumnComponentGrid extends React.Component<any> {
   render() {
     type TypedGriddle = new () => Griddle<MyCustomResult>;
     const TypedGriddle = Griddle as TypedGriddle;
diff --git a/types/griddle-react/test/CustomFilterComponent.tsx b/types/griddle-react/test/CustomFilterComponent.tsx
index 3de40132f1..25a7030545 100644
--- a/types/griddle-react/test/CustomFilterComponent.tsx
+++ b/types/griddle-react/test/CustomFilterComponent.tsx
@@ -22,7 +22,7 @@ const CustomFilterFunction = (items: ResultType[], query: string): ResultType[]
   });
 };
 
-class CustomFilterComponent extends React.Component<CustomFilterComponentProps, any> {
+class CustomFilterComponent extends React.Component<CustomFilterComponentProps> {
   query: string = '';
 
   searchChange(event: React.FormEvent<HTMLInputElement>) {
@@ -73,7 +73,7 @@ const someData: ResultType[] = [
   }
 ];
 
-class CustomFilterComponentGrid extends React.Component<any, any> {
+class CustomFilterComponentGrid extends React.Component<any> {
   render() {
     type TypedGriddle = new () => Griddle<ResultType>;
     const TypedGriddle = Griddle as TypedGriddle;
diff --git a/types/griddle-react/test/CustomHeaderComponent.tsx b/types/griddle-react/test/CustomHeaderComponent.tsx
index af9d1d6ea3..218dc89b55 100644
--- a/types/griddle-react/test/CustomHeaderComponent.tsx
+++ b/types/griddle-react/test/CustomHeaderComponent.tsx
@@ -11,7 +11,7 @@ interface MoreCustomHeaderComponentProps extends CustomHeaderComponentProps {
   color: string;
 }
 
-class HeaderComponent extends React.Component<MoreCustomHeaderComponentProps, any> {
+class HeaderComponent extends React.Component<MoreCustomHeaderComponentProps> {
   textOnClick(e: React.FormEvent<HTMLInputElement>) {
     e.stopPropagation();
   }
@@ -80,7 +80,7 @@ const  columnMeta: Array<ColumnMetaData<ResultType>> = [
   }
 ];
 
-class CustomHeaderComponentGrid extends React.Component<any, any> {
+class CustomHeaderComponentGrid extends React.Component<any> {
   render() {
     type TypedGriddle = new () => Griddle<ResultType>;
     const TypedGriddle = Griddle as TypedGriddle;
diff --git a/types/griddle-react/test/index.tsx b/types/griddle-react/test/index.tsx
index 3e0b1c76ff..4c977c0f97 100644
--- a/types/griddle-react/test/index.tsx
+++ b/types/griddle-react/test/index.tsx
@@ -16,7 +16,7 @@ interface MyCustomResult {
   test: string;
 }
 
-class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>, any> {
+class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>> {
   render() {
     const url = "speakers/" + this.props.rowData.test + "/" + this.props.data;
     return <a href={url}>{this.props.data}</a>;
diff --git a/types/halogen/index.d.ts b/types/halogen/index.d.ts
index 39197a33a5..216281972e 100644
--- a/types/halogen/index.d.ts
+++ b/types/halogen/index.d.ts
@@ -34,50 +34,50 @@ export interface RadiusLoaderProps extends MarginLoaderProps<string> {
 /**
  * React components
  */
-export type PulseLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type PulseLoader = react.Component<MarginLoaderProps<string>>;
 export const PulseLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type RotateLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type RotateLoader = react.Component<MarginLoaderProps<string>>;
 export const RotateLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type BeatLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type BeatLoader = react.Component<MarginLoaderProps<string>>;
 export const BeatLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type RiseLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type RiseLoader = react.Component<MarginLoaderProps<string>>;
 export const RiseLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type SyncLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type SyncLoader = react.Component<MarginLoaderProps<string>>;
 export const SyncLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type GridLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type GridLoader = react.Component<MarginLoaderProps<string>>;
 export const GridLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type ClipLoader = react.Component<SizeLoaderProps, {}>;
+export type ClipLoader = react.Component<SizeLoaderProps>;
 export const ClipLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type SquareLoader = react.Component<SizeLoaderProps, {}>;
+export type SquareLoader = react.Component<SizeLoaderProps>;
 export const SquareLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type DotLoader = react.Component<SizeLoaderProps, {}>;
+export type DotLoader = react.Component<SizeLoaderProps>;
 export const DotLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type PacmanLoader = react.Component<MarginLoaderProps<number>, {}>;
+export type PacmanLoader = react.Component<MarginLoaderProps<number>>;
 export const PacmanLoader: react.ComponentClass<MarginLoaderProps<number>>;
 
-export type MoonLoader = react.Component<SizeLoaderProps, {}>;
+export type MoonLoader = react.Component<SizeLoaderProps>;
 export const MoonLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type RingLoader = react.Component<SizeLoaderProps, {}>;
+export type RingLoader = react.Component<SizeLoaderProps>;
 export const RingLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type BounceLoader = react.Component<SizeLoaderProps, {}>;
+export type BounceLoader = react.Component<SizeLoaderProps>;
 export const BounceLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type SkewLoader = react.Component<SizeLoaderProps, {}>;
+export type SkewLoader = react.Component<SizeLoaderProps>;
 export const SkewLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type FadeLoader = react.Component<RadiusLoaderProps, {}>;
+export type FadeLoader = react.Component<RadiusLoaderProps>;
 export const FadeLoader: react.ComponentClass<RadiusLoaderProps>;
 
-export type ScaleLoader = react.Component<RadiusLoaderProps, {}>;
+export type ScaleLoader = react.Component<RadiusLoaderProps>;
 export const ScaleLoader: react.ComponentClass<RadiusLoaderProps>;
diff --git a/types/halogen/test/clip-loader.tsx b/types/halogen/test/clip-loader.tsx
index 02f0dd232c..af3a72762f 100644
--- a/types/halogen/test/clip-loader.tsx
+++ b/types/halogen/test/clip-loader.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Halogen from "halogen";
 
-class HalogenTests_ClipLoader_withNoProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_ClipLoader_withNoProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.ClipLoader />
@@ -9,7 +9,7 @@ class HalogenTests_ClipLoader_withNoProps extends React.Component<React.Props<{}
   }
 }
 
-class HalogenTests_ClipLoader_withAllProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_ClipLoader_withAllProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.ClipLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="bottom" size="200px" />
diff --git a/types/halogen/test/fade-loader.tsx b/types/halogen/test/fade-loader.tsx
index deeae1ce95..23fb8fa3ca 100644
--- a/types/halogen/test/fade-loader.tsx
+++ b/types/halogen/test/fade-loader.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Halogen from "halogen";
 
-class HalogenTests_FadeLoader_withNoProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_FadeLoader_withNoProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.FadeLoader />
@@ -9,7 +9,7 @@ class HalogenTests_FadeLoader_withNoProps extends React.Component<React.Props<{}
   }
 }
 
-class HalogenTests_FadeLoader_withAllProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_FadeLoader_withAllProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.FadeLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle"
diff --git a/types/halogen/test/pacman-loader.tsx b/types/halogen/test/pacman-loader.tsx
index 7852026580..86aeda7172 100644
--- a/types/halogen/test/pacman-loader.tsx
+++ b/types/halogen/test/pacman-loader.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Halogen from "halogen";
 
-class HalogenTests_PacmanLoader_withNoProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_PacmanLoader_withNoProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.PacmanLoader />
@@ -9,7 +9,7 @@ class HalogenTests_PacmanLoader_withNoProps extends React.Component<React.Props<
   }
 }
 
-class HalogenTests_PacmanLoader_withAllProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_PacmanLoader_withAllProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.PacmanLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle" margin={10} size={200} />
diff --git a/types/halogen/test/rotate-loader.tsx b/types/halogen/test/rotate-loader.tsx
index a5325a4962..38274aefea 100644
--- a/types/halogen/test/rotate-loader.tsx
+++ b/types/halogen/test/rotate-loader.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Halogen from "halogen";
 
-class HalogenTests_RotateLoader_withNoProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_RotateLoader_withNoProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.RotateLoader />
@@ -9,7 +9,7 @@ class HalogenTests_RotateLoader_withNoProps extends React.Component<React.Props<
   }
 }
 
-class HalogenTests_RotateLoader_withAllProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_RotateLoader_withAllProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.RotateLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle" margin="10px" size="100px" />
diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index ea00828227..bee87ab936 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -109,7 +109,7 @@ declare namespace __MaterialUI {
     interface ThemeWrapperProps {
         theme: Styles.MuiTheme;
     }
-    export class ThemeWrapper extends React.Component<ThemeWrapperProps, {}> {
+    export class ThemeWrapper extends React.Component<ThemeWrapperProps> {
     }
 
     export namespace Styles {
@@ -470,7 +470,7 @@ declare namespace __MaterialUI {
         interface MuiThemeProviderProps {
             muiTheme?: Styles.MuiTheme;
         }
-        export class MuiThemeProvider extends React.Component<MuiThemeProviderProps, {}> {
+        export class MuiThemeProvider extends React.Component<MuiThemeProviderProps> {
         }
 
         export function getMuiTheme(...muiTheme: MuiTheme[]): MuiTheme;
@@ -519,12 +519,12 @@ declare namespace __MaterialUI {
         titleStyle?: React.CSSProperties;
         zDepth?: number;
     }
-    export class AppBar extends React.Component<AppBarProps, {}> {
+    export class AppBar extends React.Component<AppBarProps> {
     }
 
     interface AppCanvasProps {
     }
-    export class AppCanvas extends React.Component<AppCanvasProps, {}> {
+    export class AppCanvas extends React.Component<AppCanvasProps> {
     }
 
     namespace propTypes {
@@ -584,7 +584,7 @@ declare namespace __MaterialUI {
         targetOrigin?: propTypes.origin;
         textFieldStyle?: React.CSSProperties;
     }
-    export class AutoComplete extends React.Component<AutoCompleteProps<any>, {}> {
+    export class AutoComplete extends React.Component<AutoCompleteProps<any>> {
         static noFilter: () => boolean;
         static defaultFilter: (searchText: string, key: string) => boolean;
         static caseSensitiveFilter: (searchText: string, key: string) => boolean;
@@ -606,7 +606,7 @@ declare namespace __MaterialUI {
         src?: string;
         style?: React.CSSProperties;
     }
-    export class Avatar extends React.Component<AvatarProps, {}> {
+    export class Avatar extends React.Component<AvatarProps> {
     }
 
     interface BadgeProps {
@@ -617,7 +617,7 @@ declare namespace __MaterialUI {
         secondary?: boolean;
         style?: React.CSSProperties;
     }
-    export class Badge extends React.Component<BadgeProps, {}> {
+    export class Badge extends React.Component<BadgeProps> {
     }
 
     interface BeforeAfterWrapperProps {
@@ -628,7 +628,7 @@ declare namespace __MaterialUI {
         elementType?: string;
         style?: React.CSSProperties;
     }
-    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> {
+    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps> {
     }
 
     // non generally overridden elements of EnhancedButton
@@ -662,7 +662,7 @@ declare namespace __MaterialUI {
         containerElement?: React.ReactNode | string;
         disabled?: boolean;
     }
-    export class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {
+    export class EnhancedButton extends React.Component<EnhancedButtonProps> {
     }
 
     interface FlatButtonProps extends React.DOMAttributes<{}>, SharedEnhancedButtonProps<FlatButton> {
@@ -686,7 +686,7 @@ declare namespace __MaterialUI {
         secondary?: boolean;
         style?: React.CSSProperties;
     }
-    export class FlatButton extends React.Component<FlatButtonProps, {}> {
+    export class FlatButton extends React.Component<FlatButtonProps> {
     }
 
     interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
@@ -716,7 +716,7 @@ declare namespace __MaterialUI {
         secondary?: boolean;
         style?: React.CSSProperties;
     }
-    export class RaisedButton extends React.Component<RaisedButtonProps, {}> {
+    export class RaisedButton extends React.Component<RaisedButtonProps> {
     }
 
     interface FloatingActionButtonProps extends React.HTMLAttributes<{}>, SharedEnhancedButtonProps<FloatingActionButton> {
@@ -738,7 +738,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         zDepth?: number;
     }
-    export class FloatingActionButton extends React.Component<FloatingActionButtonProps, {}> {
+    export class FloatingActionButton extends React.Component<FloatingActionButtonProps> {
     }
 
     interface IconButtonProps extends React.HTMLAttributes<{}>, SharedEnhancedButtonProps<IconButton> {
@@ -761,7 +761,7 @@ declare namespace __MaterialUI {
         tooltipStyles?: React.CSSProperties;
         touch?: boolean;
     }
-    export class IconButton extends React.Component<IconButtonProps, {}> {
+    export class IconButton extends React.Component<IconButtonProps> {
     }
 
     namespace BottomNavigation {
@@ -771,7 +771,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
         }
 
-        export class BottomNavigation extends React.Component<BottomNavigationProps, {}> { }
+        export class BottomNavigation extends React.Component<BottomNavigationProps> { }
 
         interface BottomNavigationItemProps extends SharedEnhancedButtonProps<BottomNavigationItem> {
             className?: string;
@@ -779,7 +779,7 @@ declare namespace __MaterialUI {
             label?: React.ReactNode;
         }
 
-        export class BottomNavigationItem extends React.Component<BottomNavigationItemProps, {}> { }
+        export class BottomNavigationItem extends React.Component<BottomNavigationItemProps> { }
     }
 
     namespace Card {
@@ -795,7 +795,7 @@ declare namespace __MaterialUI {
             showExpandableButton?: boolean;
             style?: React.CSSProperties;
         }
-        export class Card extends React.Component<CardProps, {}> {
+        export class Card extends React.Component<CardProps> {
         }
 
         interface CardActionsProps {
@@ -805,7 +805,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             className?: string;
         }
-        export class CardActions extends React.Component<CardActionsProps, {}> {
+        export class CardActions extends React.Component<CardActionsProps> {
         }
 
         interface CardExpandableProps {
@@ -813,7 +813,7 @@ declare namespace __MaterialUI {
             onExpanding?: (isExpanded: boolean) => void;
             style?: React.CSSProperties;
         }
-        export class CardExpandable extends React.Component<CardExpandableProps, {}> {
+        export class CardExpandable extends React.Component<CardExpandableProps> {
         }
 
         interface CardHeaderProps {
@@ -834,7 +834,7 @@ declare namespace __MaterialUI {
             closeIcon?: React.ReactNode;
             iconStyle?: React.CSSProperties;
         }
-        export class CardHeader extends React.Component<CardHeaderProps, {}> {
+        export class CardHeader extends React.Component<CardHeaderProps> {
         }
 
         interface CardMediaProps {
@@ -847,7 +847,7 @@ declare namespace __MaterialUI {
             overlayStyle?: React.CSSProperties;
             style?: React.CSSProperties;
         }
-        export class CardMedia extends React.Component<CardMediaProps, {}> {
+        export class CardMedia extends React.Component<CardMediaProps> {
         }
 
         interface CardTextProps {
@@ -857,7 +857,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             className?: string;
         }
-        export class CardText extends React.Component<CardTextProps, {}> {
+        export class CardText extends React.Component<CardTextProps> {
         }
 
         interface CardTitleProps {
@@ -872,7 +872,7 @@ declare namespace __MaterialUI {
             titleColor?: string;
             titleStyle?: React.CSSProperties;
         }
-        export class CardTitle extends React.Component<CardTitleProps, {}> {
+        export class CardTitle extends React.Component<CardTitleProps> {
         }
     }
 
@@ -885,7 +885,7 @@ declare namespace __MaterialUI {
         onTouchTap?: React.TouchEventHandler<Chip>;
         style?: React.CSSProperties;
     }
-    export class Chip extends React.Component<ChipProps, {}> {
+    export class Chip extends React.Component<ChipProps> {
     }
 
     namespace DatePicker {
@@ -941,7 +941,7 @@ declare namespace __MaterialUI {
             underlineStyle?: React.CSSProperties;
             utils?: propTypes.utils;
         }
-        export class DatePicker extends React.Component<DatePickerProps, {}> {
+        export class DatePicker extends React.Component<DatePickerProps> {
         }
 
         interface DatePickerDialogProps {
@@ -966,7 +966,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             utils?: propTypes.utils;
         }
-        export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
+        export class DatePickerDialog extends React.Component<DatePickerDialogProps> {
             public show(): void;
             public dismiss(): void;
         }
@@ -1004,7 +1004,7 @@ declare namespace __MaterialUI {
         titleClassName?: string;
         titleStyle?: React.CSSProperties;
     }
-    export class Dialog extends React.Component<DialogProps, {}> {
+    export class Dialog extends React.Component<DialogProps> {
     }
 
     interface DividerProps {
@@ -1012,7 +1012,7 @@ declare namespace __MaterialUI {
         inset?: boolean;
         style?: React.CSSProperties;
     }
-    export class Divider extends React.Component<DividerProps, {}> {
+    export class Divider extends React.Component<DividerProps> {
     }
 
     interface DrawerProps {
@@ -1031,7 +1031,7 @@ declare namespace __MaterialUI {
         width?: number | string;
         zDepth?: number;
     }
-    export class Drawer extends React.Component<DrawerProps, {}> {
+    export class Drawer extends React.Component<DrawerProps> {
     }
 
     namespace GridList {
@@ -1041,7 +1041,7 @@ declare namespace __MaterialUI {
             padding?: number;
             style?: React.CSSProperties;
         }
-        export class GridList extends React.Component<GridListProps, {}> {
+        export class GridList extends React.Component<GridListProps> {
         }
 
         interface GridTileProps {
@@ -1057,7 +1057,7 @@ declare namespace __MaterialUI {
             titlePosition?: "top" | "bottom";
             onTouchTap?: TouchTapEventHandler;
         }
-        export class GridTile extends React.Component<GridTileProps, {}> {
+        export class GridTile extends React.Component<GridTileProps> {
         }
     }
 
@@ -1069,7 +1069,7 @@ declare namespace __MaterialUI {
         onMouseLeave?: React.MouseEventHandler<{}>;
         style?: React.CSSProperties;
     }
-    export class FontIcon extends React.Component<FontIconProps, {}> {
+    export class FontIcon extends React.Component<FontIconProps> {
     }
 
     interface SvgIconProps extends React.SVGAttributes<{}>, React.Props<SvgIcon> {
@@ -1081,7 +1081,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         viewBox?: string;
     }
-    export class SvgIcon extends React.Component<SvgIconProps, {}> {
+    export class SvgIcon extends React.Component<SvgIconProps> {
     }
 
     namespace List {
@@ -1089,7 +1089,7 @@ declare namespace __MaterialUI {
             // <Paper/> is the element that get the 'other' properties
             style?: React.CSSProperties;
         }
-        export class List extends React.Component<ListProps, {}> {
+        export class List extends React.Component<ListProps> {
         }
 
         interface ListItemProps extends EnhancedButtonProps {
@@ -1124,7 +1124,7 @@ declare namespace __MaterialUI {
             secondaryTextLines?: number; // 1 or 2
             style?: React.CSSProperties;
         }
-        export class ListItem extends React.Component<ListItemProps, {}> {
+        export class ListItem extends React.Component<ListItemProps> {
         }
 
         interface SelectableProps {
@@ -1157,7 +1157,7 @@ declare namespace __MaterialUI {
             valueLink?: ReactLink<any | any[]>;
             width?: string | number;
         }
-        export class Menu extends React.Component<MenuProps, {}> {
+        export class Menu extends React.Component<MenuProps> {
         }
 
         interface MenuItemProps extends List.ListItemProps {
@@ -1179,7 +1179,7 @@ declare namespace __MaterialUI {
             value?: any;
             containerElement?: React.ReactNode | string;
         }
-        export class MenuItem extends React.Component<MenuItemProps, {}> {
+        export class MenuItem extends React.Component<MenuItemProps> {
         }
 
         interface IconMenuProps {
@@ -1217,7 +1217,7 @@ declare namespace __MaterialUI {
             valueLink?: ReactLink<any | any[]>;
             width?: string | number;
         }
-        export class IconMenu extends React.Component<IconMenuProps, {}> {
+        export class IconMenu extends React.Component<IconMenuProps> {
         }
 
         interface DropDownMenuProps {
@@ -1239,7 +1239,7 @@ declare namespace __MaterialUI {
             underlineStyle?: React.CSSProperties;
             value?: any;
         }
-        export class DropDownMenu extends React.Component<DropDownMenuProps, {}> {
+        export class DropDownMenu extends React.Component<DropDownMenuProps> {
         }
     }
 
@@ -1250,7 +1250,7 @@ declare namespace __MaterialUI {
         onClick?: React.MouseEventHandler<{}>;
         onTouchTap?: TouchTapEventHandler;
     }
-    export class Overlay extends React.Component<OverlayProps, {}> {
+    export class Overlay extends React.Component<OverlayProps> {
     }
 
     interface PaperProps extends React.HTMLAttributes<{}>, React.Props<Paper> {
@@ -1260,7 +1260,7 @@ declare namespace __MaterialUI {
         transitionEnabled?: boolean;
         zDepth?: number;
     }
-    export class Paper extends React.Component<PaperProps, {}> {
+    export class Paper extends React.Component<PaperProps> {
     }
 
     namespace Popover {
@@ -1284,7 +1284,7 @@ declare namespace __MaterialUI {
             useLayerForClickAway?: boolean;
             zDepth?: number;
         }
-        export class Popover extends React.Component<PopoverProps, {}> {
+        export class Popover extends React.Component<PopoverProps> {
         }
 
         interface PopoverAnimationVerticalProps extends PopoverAnimationProps {
@@ -1292,7 +1292,7 @@ declare namespace __MaterialUI {
             targetOrigin?: propTypes.origin;
             zDepth?: number;
         }
-        export class PopoverAnimationVertical extends React.Component<PopoverAnimationVerticalProps, {}> {
+        export class PopoverAnimationVertical extends React.Component<PopoverAnimationVerticalProps> {
         }
 
         interface PopoverAnimationDefaultProps extends PopoverAnimationProps {
@@ -1300,7 +1300,7 @@ declare namespace __MaterialUI {
             targetOrigin?: propTypes.origin;
             zDepth?: number;
         }
-        export class PopoverAnimationDefault extends React.Component<PopoverAnimationDefaultProps, {}> {
+        export class PopoverAnimationDefault extends React.Component<PopoverAnimationDefaultProps> {
         }
     }
 
@@ -1315,7 +1315,7 @@ declare namespace __MaterialUI {
         thickness?: number;
         value?: number;
     }
-    export class CircularProgress extends React.Component<CircularProgressProps, {}> {
+    export class CircularProgress extends React.Component<CircularProgressProps> {
     }
 
     interface LinearProgressProps {
@@ -1326,7 +1326,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         value?: number;
     }
-    export class LinearProgress extends React.Component<LinearProgressProps, {}> {
+    export class LinearProgress extends React.Component<LinearProgressProps> {
     }
 
     interface RefreshIndicatorProps {
@@ -1339,7 +1339,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         top: number;
     }
-    export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
+    export class RefreshIndicator extends React.Component<RefreshIndicatorProps> {
     }
 
     interface SelectFieldProps {
@@ -1378,7 +1378,7 @@ declare namespace __MaterialUI {
         selectedMenuItemStyle?: React.CSSProperties;
         openImmediately?: boolean;
     }
-    export class SelectField extends React.Component<SelectFieldProps, {}> {
+    export class SelectField extends React.Component<SelectFieldProps> {
     }
 
     interface SliderProps {
@@ -1402,7 +1402,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         value?: number;
     }
-    export class Slider extends React.Component<SliderProps, {}> {
+    export class Slider extends React.Component<SliderProps> {
     }
 
     namespace Switches {
@@ -1445,7 +1445,7 @@ declare namespace __MaterialUI {
             trackStyle?: React.CSSProperties;
             value?: string;
         }
-        export class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> {
+        export class EnhancedSwitch extends React.Component<EnhancedSwitchProps> {
             getValue(): string;
             isKeyboardFocused(): boolean;
             isSwitched(): boolean;
@@ -1466,7 +1466,7 @@ declare namespace __MaterialUI {
             uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
             valueLink?: ReactLink<boolean>;
         }
-        export class Checkbox extends React.Component<CheckboxProps, {}> {
+        export class Checkbox extends React.Component<CheckboxProps> {
             /** @deprecated Use checked property instead */
             isChecked(): void;
 
@@ -1486,7 +1486,7 @@ declare namespace __MaterialUI {
             uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
             value?: any;
         }
-        export class RadioButton extends React.Component<RadioButtonProps, {}> {
+        export class RadioButton extends React.Component<RadioButtonProps> {
             isChecked(): boolean;
 
             getValue(): string;
@@ -1501,7 +1501,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             valueSelected?: any;
         }
-        export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
+        export class RadioButtonGroup extends React.Component<RadioButtonGroupProps> {
             clearValue(): void;
 
             getSelectedValue(): string;
@@ -1529,7 +1529,7 @@ declare namespace __MaterialUI {
             trackStyle?: React.CSSProperties;
             valueLink?: ReactLink<boolean>;
         }
-        export class Toggle extends React.Component<ToggleProps, {}> {
+        export class Toggle extends React.Component<ToggleProps> {
             isToggled(): boolean;
 
             setToggled(newToggledValue: boolean): void;
@@ -1548,7 +1548,7 @@ declare namespace __MaterialUI {
         open: boolean;
         style?: React.CSSProperties;
     }
-    export class Snackbar extends React.Component<SnackbarProps, {}> {
+    export class Snackbar extends React.Component<SnackbarProps> {
     }
 
     namespace Stepper {
@@ -1558,7 +1558,7 @@ declare namespace __MaterialUI {
             disabled?: boolean;
             style?: React.CSSProperties;
         }
-        export class Step extends React.Component<StepProps, {}> {
+        export class Step extends React.Component<StepProps> {
         }
 
         interface StepButtonProps extends SharedEnhancedButtonProps<StepButton> {
@@ -1571,7 +1571,7 @@ declare namespace __MaterialUI {
             onTouchStart?: React.TouchEventHandler<{}>;
             style?: React.CSSProperties;
         }
-        export class StepButton extends React.Component<StepButtonProps, {}> {
+        export class StepButton extends React.Component<StepButtonProps> {
         }
 
         interface StepContentProps {
@@ -1579,7 +1579,7 @@ declare namespace __MaterialUI {
             last?: boolean;
             style?: React.CSSProperties;
         }
-        export class StepContent extends React.Component<StepContentProps, {}> {
+        export class StepContent extends React.Component<StepContentProps> {
         }
 
         interface StepLabelProps {
@@ -1590,7 +1590,7 @@ declare namespace __MaterialUI {
             iconContainerStyle?: React.CSSProperties;
             style?: React.CSSProperties;
         }
-        export class StepLabel extends React.Component<StepLabelProps, {}> {
+        export class StepLabel extends React.Component<StepLabelProps> {
         }
 
         interface SnackbarProps extends React.Props<Snackbar> {
@@ -1616,7 +1616,7 @@ declare namespace __MaterialUI {
             orientation?: "horizontal" | "vertical";
             style?: React.CSSProperties;
         }
-        export class Stepper extends React.Component<StepperProps, {}> {
+        export class Stepper extends React.Component<StepperProps> {
         }
     }
 
@@ -1624,7 +1624,7 @@ declare namespace __MaterialUI {
         inset?: boolean;
         style?: React.CSSProperties;
     }
-    export class Subheader extends React.Component<SubheaderProps, {}> {
+    export class Subheader extends React.Component<SubheaderProps> {
     }
 
     namespace Table {
@@ -1648,7 +1648,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             wrapperStyle?: React.CSSProperties;
         }
-        export class Table extends React.Component<TableProps, {}> {
+        export class Table extends React.Component<TableProps> {
         }
 
         interface TableRowProps {
@@ -1675,7 +1675,7 @@ declare namespace __MaterialUI {
             striped?: boolean;
             style?: React.CSSProperties;
         }
-        export class TableRow extends React.Component<TableRowProps, {}> {
+        export class TableRow extends React.Component<TableRowProps> {
         }
 
         interface TableRowColumnProps {
@@ -1695,7 +1695,7 @@ declare namespace __MaterialUI {
             // useful attributes passed to <td/>
             colSpan?: number;
         }
-        export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
+        export class TableRowColumn extends React.Component<TableRowColumnProps> {
         }
 
         interface TableHeaderProps {
@@ -1709,7 +1709,7 @@ declare namespace __MaterialUI {
             selectAllSelected?: boolean;
             style?: React.CSSProperties;
         }
-        export class TableHeader extends React.Component<TableHeaderProps, {}> {
+        export class TableHeader extends React.Component<TableHeaderProps> {
         }
 
         interface TableHeaderColumnProps {
@@ -1725,7 +1725,7 @@ declare namespace __MaterialUI {
             // useful attributes passed to <th/>
             colSpan?: number;
         }
-        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
+        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps> {
         }
 
         interface TableBodyProps {
@@ -1755,7 +1755,7 @@ declare namespace __MaterialUI {
             stripedRows?: boolean;
             style?: React.CSSProperties;
         }
-        export class TableBody extends React.Component<TableBodyProps, {}> {
+        export class TableBody extends React.Component<TableBodyProps> {
         }
 
         interface TableFooterProps {
@@ -1764,7 +1764,7 @@ declare namespace __MaterialUI {
             className?: string;
             style?: React.CSSProperties;
         }
-        export class TableFooter extends React.Component<TableFooterProps, {}> {
+        export class TableFooter extends React.Component<TableFooterProps> {
         }
     }
 
@@ -1782,7 +1782,7 @@ declare namespace __MaterialUI {
             tabTemplateStyle?: React.CSSProperties;
             value?: any;
         }
-        export class Tabs extends React.Component<TabsProps, {}> {
+        export class Tabs extends React.Component<TabsProps> {
         }
 
         interface TabProps extends SharedEnhancedButtonProps<Tab> {
@@ -1841,7 +1841,7 @@ declare namespace __MaterialUI {
         step?: number;
         autoComplete?: string;
     }
-    export class TextField extends React.Component<TextFieldProps, {}> {
+    export class TextField extends React.Component<TextFieldProps> {
         blur(): void;
 
         focus(): void;
@@ -1900,7 +1900,7 @@ declare namespace __MaterialUI {
         underlineShow?: boolean;
         underlineStyle?: React.CSSProperties;
     }
-    export class TimePicker extends React.Component<TimePickerProps, {}> {
+    export class TimePicker extends React.Component<TimePickerProps> {
         focus(): void;
 
         openDialog(): void;
@@ -1912,7 +1912,7 @@ declare namespace __MaterialUI {
             noGutter?: boolean;
             style?: React.CSSProperties;
         }
-        export class Toolbar extends React.Component<ToolbarProps, {}> {
+        export class Toolbar extends React.Component<ToolbarProps> {
         }
 
         interface ToolbarGroupProps {
@@ -1922,14 +1922,14 @@ declare namespace __MaterialUI {
             lastChild?: boolean;
             style?: React.CSSProperties;
         }
-        export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
+        export class ToolbarGroup extends React.Component<ToolbarGroupProps> {
         }
 
         interface ToolbarSeparatorProps {
             className?: string;
             style?: React.CSSProperties;
         }
-        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
+        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps> {
         }
 
         interface ToolbarTitleProps extends React.HTMLAttributes<{}>, React.Props<ToolbarTitle> {
@@ -1937,7 +1937,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             text?: string;
         }
-        export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
+        export class ToolbarTitle extends React.Component<ToolbarTitleProps> {
         }
     }
 
@@ -8586,14 +8586,14 @@ declare module "material-ui/svg-icons" {
 
 declare module 'material-ui/internal/AppCanvas' {
     interface AppCanvasProps extends React.Props<AppCanvas> { }
-    class AppCanvas extends React.Component<AppCanvasProps, {}> { }
+    class AppCanvas extends React.Component<AppCanvasProps> { }
     export default AppCanvas;
 }
 declare module 'material-ui/internal/AutoLockScrolling' {
     interface AutoLockScrollingProps extends React.Props<AutoLockScrolling> {
         lock: boolean;
     }
-    class AutoLockScrolling extends React.Component<AutoLockScrollingProps, {}> { }
+    class AutoLockScrolling extends React.Component<AutoLockScrollingProps> { }
     export default AutoLockScrolling;
 }
 declare module 'material-ui/internal/BeforeAfterWrapper' {
@@ -8605,7 +8605,7 @@ declare module 'material-ui/internal/BeforeAfterWrapper' {
         elementType?: string,
         style?: React.CSSProperties,
     }
-    class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> { }
+    class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps> { }
     export default BeforeAfterWrapper;
 }
 declare module 'material-ui/internal/CircleRipple' {
@@ -8615,33 +8615,33 @@ declare module 'material-ui/internal/CircleRipple' {
         opacity?: number;
         style?: React.CSSProperties;
     }
-    class CircleRipple extends React.Component<CircleRippleProps, {}> { }
+    class CircleRipple extends React.Component<CircleRippleProps> { }
     export default CircleRipple;
 }
 declare module 'material-ui/internal/ClearFix' {
     interface ClearFixProps extends React.Props<ClearFix> {
         style?: React.CSSProperties;
     }
-    class ClearFix extends React.Component<ClearFixProps, {}> { }
+    class ClearFix extends React.Component<ClearFixProps> { }
     export default ClearFix;
 }
 declare module 'material-ui/internal/ClickAwayListener' {
     interface ClickAwayListenerProps extends React.Props<ClickAwayListener> {
         onClickAway?: any,
     }
-    class ClickAwayListener extends React.Component<ClickAwayListenerProps, {}> { }
+    class ClickAwayListener extends React.Component<ClickAwayListenerProps> { }
     export default ClickAwayListener;
 }
 declare module 'material-ui/internal/EnhancedButton' {
     interface EnhancedButtonProps extends __MaterialUI.SharedEnhancedButtonProps<EnhancedButton> {
     }
-    class EnhancedButton extends React.Component<EnhancedButtonProps, {}> { }
+    class EnhancedButton extends React.Component<EnhancedButtonProps> { }
     export default EnhancedButton;
 }
 declare module 'material-ui/internal/EnhancedSwitch' {
     interface EnhancedSwitchProps extends __MaterialUI.Switches.CommonEnhancedSwitchProps<EnhancedSwitch> {
     }
-    class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> { }
+    class EnhancedSwitch extends React.Component<EnhancedSwitchProps> { }
     export default EnhancedSwitch;
 }
 declare module 'material-ui/internal/ExpandTransition' {
@@ -8653,7 +8653,7 @@ declare module 'material-ui/internal/ExpandTransition' {
         transitionDelay?: number;
         transitionDuration?: number;
     }
-    class ExpandTransition extends React.Component<ExpandTransitionProps, {}> { }
+    class ExpandTransition extends React.Component<ExpandTransitionProps> { }
     export default ExpandTransition;
 }
 declare module 'material-ui/internal/ExpandTransitionChild' {
@@ -8663,7 +8663,7 @@ declare module 'material-ui/internal/ExpandTransitionChild' {
         transitionDelay?: number;
         transitionDuration?: number;
     }
-    class ExpandTransitionChild extends React.Component<ExpandTransitionChildProps, {}> { }
+    class ExpandTransitionChild extends React.Component<ExpandTransitionChildProps> { }
     export default ExpandTransitionChild;
 }
 declare module 'material-ui/internal/FocusRipple' {
@@ -8674,7 +8674,7 @@ declare module 'material-ui/internal/FocusRipple' {
         show?: boolean,
         style?: React.CSSProperties
     }
-    class FocusRipple extends React.Component<FocusRippleProps, {}> { }
+    class FocusRipple extends React.Component<FocusRippleProps> { }
     export default FocusRipple;
 }
 declare module 'material-ui/internal/Overlay' {
@@ -8686,7 +8686,7 @@ declare module 'material-ui/internal/Overlay' {
         onClick?: React.MouseEventHandler<{}>;
         onTouchTap?: __MaterialUI.TouchTapEventHandler;
     }
-    class Overlay extends React.Component<OverlayProps, {}> { }
+    class Overlay extends React.Component<OverlayProps> { }
     export default Overlay;
 }
 declare module 'material-ui/internal/RenderToLayer' {
@@ -8696,7 +8696,7 @@ declare module 'material-ui/internal/RenderToLayer' {
         render: Function;
         useLayerForClickAway?: boolean;
     }
-    class RenderToLayer extends React.Component<RenderToLayerProps, {}> { }
+    class RenderToLayer extends React.Component<RenderToLayerProps> { }
     export default RenderToLayer;
 }
 declare module 'material-ui/internal/ScaleIn' {
@@ -8706,7 +8706,7 @@ declare module 'material-ui/internal/ScaleIn' {
         maxScale?: number;
         minScale?: number;
     }
-    class ScaleIn extends React.Component<ScaleInProps, {}> { }
+    class ScaleIn extends React.Component<ScaleInProps> { }
     export default ScaleIn;
 }
 declare module 'material-ui/internal/ScaleInChild' {
@@ -8716,7 +8716,7 @@ declare module 'material-ui/internal/ScaleInChild' {
         minScale?: number;
         style?: React.CSSProperties;
     }
-    class ScaleInChild extends React.Component<ScaleInChildProps, {}> { }
+    class ScaleInChild extends React.Component<ScaleInChildProps> { }
     export default ScaleInChild;
 }
 declare module 'material-ui/internal/SlideIn' {
@@ -8726,7 +8726,7 @@ declare module 'material-ui/internal/SlideIn' {
         enterDelay?: number;
         style?: React.CSSProperties;
     }
-    class SlideIn extends React.Component<SlideInProps, {}> { }
+    class SlideIn extends React.Component<SlideInProps> { }
     export default SlideIn;
 }
 declare module 'material-ui/internal/SlideInChild' {
@@ -8736,7 +8736,7 @@ declare module 'material-ui/internal/SlideInChild' {
         getLeaveDirection: Function;
         style?: React.CSSProperties;
     }
-    class SlideInChild extends React.Component<SlideInChildProps, {}> { }
+    class SlideInChild extends React.Component<SlideInChildProps> { }
     export default SlideInChild;
 }
 declare module 'material-ui/internal/Tooltip' {
@@ -8749,7 +8749,7 @@ declare module 'material-ui/internal/Tooltip' {
         touch?: boolean;
         verticalPosition?: __MaterialUI.propTypes.vertical;
     }
-    class Tooltip extends React.Component<TooltipProps, {}> { }
+    class Tooltip extends React.Component<TooltipProps> { }
     export default Tooltip;
 }
 declare module 'material-ui/internal/TouchRipple' {
@@ -8760,6 +8760,6 @@ declare module 'material-ui/internal/TouchRipple' {
         opacity?: number;
         style?: React.CSSProperties
     }
-    class TouchRipple extends React.Component<TouchRippleProps, {}> { }
+    class TouchRipple extends React.Component<TouchRippleProps> { }
     export default TouchRipple;
 }
diff --git a/types/material-ui/material-ui-tests.tsx b/types/material-ui/material-ui-tests.tsx
index 9a0eddd0b9..fbc9cde05c 100644
--- a/types/material-ui/material-ui-tests.tsx
+++ b/types/material-ui/material-ui-tests.tsx
@@ -305,7 +305,7 @@ const lightBaseTheme = {
 const lightMuiTheme = getMuiTheme(lightBaseTheme);
 
 
-class DeepDownTheTree extends React.Component<{} & {muiTheme: MuiTheme}, {}> {
+class DeepDownTheTree extends React.Component<{} & {muiTheme: MuiTheme}> {
   static propTypes: React.ValidationMap<any> = {
     muiTheme: React.PropTypes.object.isRequired,
   };
@@ -329,7 +329,7 @@ const MuiThemeableFunction = muiThemeable()<React.StatelessComponent<Props>, Pro
 });
 
 @muiThemeable()
-class MuiThemeableClass extends React.Component<{label: string} & {muiTheme?: MuiTheme}, {}> {
+class MuiThemeableClass extends React.Component<{label: string} & {muiTheme?: MuiTheme}> {
   render() {
     return (
       <span style={{color: this.props.muiTheme.palette.textColor}}>
@@ -1075,7 +1075,7 @@ const ChipExampleSimple = () => (
   </div>
 );
 
-class ChipExampleComplex extends React.Component<{}, {}> {
+class ChipExampleComplex extends React.Component<{}> {
   handleRequestDelete = () => {
     alert('You clicked the delete button.');
   }
diff --git a/types/navigation-react/index.d.ts b/types/navigation-react/index.d.ts
index 22caa1f337..0c85dac138 100644
--- a/types/navigation-react/index.d.ts
+++ b/types/navigation-react/index.d.ts
@@ -58,7 +58,7 @@ export interface RefreshLinkProps extends LinkProps {
 /**
  * Hyperlink Component the navigates to the current State
  */
-export class RefreshLink extends Component<RefreshLinkProps, any> { }
+export class RefreshLink extends Component<RefreshLinkProps> { }
 
 /**
  * Defines the Navigation Link Props contract
@@ -73,7 +73,7 @@ export interface NavigationLinkProps extends RefreshLinkProps {
 /**
  * Hyperlink Component the navigates to a State
  */
-export class NavigationLink extends Component<NavigationLinkProps, any> { }
+export class NavigationLink extends Component<NavigationLinkProps> { }
 
 /**
  * Defines the Navigation Back Link Props contract
@@ -88,4 +88,4 @@ export interface NavigationBackLinkProps extends RefreshLinkProps {
 /**
  * Hyperlink Component the navigates back along the crumb trail
  */
-export class NavigationBackLink extends Component<NavigationBackLinkProps, any> { }
+export class NavigationBackLink extends Component<NavigationBackLinkProps> { }
diff --git a/types/radium/index.d.ts b/types/radium/index.d.ts
index 218a34ce3b..b875d797e3 100644
--- a/types/radium/index.d.ts
+++ b/types/radium/index.d.ts
@@ -36,7 +36,7 @@ declare namespace Radium {
     /**
      * <Style />
      */
-    export class Style extends React.Component<StyleProps, any> {
+    export class Style extends React.Component<StyleProps> {
     }
 
     /**
@@ -48,7 +48,7 @@ declare namespace Radium {
     /**
      * <StyleRoot />
      */
-    export class StyleRoot extends React.Component<StyleRootProps, any> {
+    export class StyleRoot extends React.Component<StyleRootProps> {
     }
 
     /**
diff --git a/types/radium/radium-tests.tsx b/types/radium/radium-tests.tsx
index 7fffa1b187..0b1b1408c2 100644
--- a/types/radium/radium-tests.tsx
+++ b/types/radium/radium-tests.tsx
@@ -3,7 +3,7 @@ import { StyleRoot, Style } from "radium";
 import * as Radium from 'radium';
 
 @Radium
-class TestComponent extends React.Component<{ a: number }, any> {
+class TestComponent extends React.Component<{ a: number }> {
 
     render() {
         return (
@@ -24,7 +24,7 @@ TestStatelessComponent = Radium(TestStatelessComponent);
     userAgent: "test",
     matchMedia: window.matchMedia
 })
-class TestComponentWithConfig extends React.Component<{ a?: number }, {}> {
+class TestComponentWithConfig extends React.Component<{ a?: number }> {
     render() {
         return (
             <div>
@@ -54,7 +54,7 @@ class TestComponentWithConfig extends React.Component<{ a?: number }, {}> {
 <TestComponentWithConfig a={5} />
 
 class TestComponentWithConfigInStyleRoot
-    extends React.Component<{ a?: number }, {}> {
+    extends React.Component<{ a?: number }> {
     render() {
         return (
             <div>
diff --git a/types/rc-select/index.d.ts b/types/rc-select/index.d.ts
index 2a4aeb3898..18dfb46e67 100644
--- a/types/rc-select/index.d.ts
+++ b/types/rc-select/index.d.ts
@@ -50,19 +50,19 @@ declare namespace RcSelect {
         defaultActiveFirstOption?: boolean;
         getPopupContainer?: (trigger: Node) => Node;
     }
-    export class Select extends React.Component<SelectProps, any> { }
+    export class Select extends React.Component<SelectProps> { }
     interface OptionProps {
         className?: string;
         disabled?: boolean;
         key?: string;
         value?: string;
     }
-    export class Option extends React.Component<OptionProps, any> { }
+    export class Option extends React.Component<OptionProps> { }
 
     interface OptGroupProps {
         label?: string | React.ReactElement<any>;
         key?: string;
         value?: string;
     }
-    export class OptGroup extends React.Component<OptGroupProps, any> { }
+    export class OptGroup extends React.Component<OptGroupProps> { }
 }
diff --git a/types/rc-select/rc-select-tests.ts b/types/rc-select/rc-select-tests.ts
index f3512da1c9..14a39e3780 100644
--- a/types/rc-select/rc-select-tests.ts
+++ b/types/rc-select/rc-select-tests.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as RcSelect from 'rc-select';
 
-class Component extends React.Component<any, any> {
+class Component extends React.Component<any> {
 
     private onChange(value: any) {
         console.log('selected', value);
diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index 839c830466..34cfc22056 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -144,11 +144,11 @@ declare namespace RcSliderClass {
     }
 }
 
-declare class RcSliderClass extends React.Component<RcSliderClass.SliderProps, {}> { }
+declare class RcSliderClass extends React.Component<RcSliderClass.SliderProps> { }
 
 declare namespace RcSliderClass {
-    class Range extends React.Component<RcSliderClass.RangeProps, {}> { }
-    class Handle extends React.Component<RcSliderClass.HandleProps, {}> { }
+    class Range extends React.Component<RcSliderClass.RangeProps> { }
+    class Handle extends React.Component<RcSliderClass.HandleProps> { }
 }
 
 export = RcSliderClass;
diff --git a/types/rc-tooltip/index.d.ts b/types/rc-tooltip/index.d.ts
index f410c5e303..84068dd920 100644
--- a/types/rc-tooltip/index.d.ts
+++ b/types/rc-tooltip/index.d.ts
@@ -33,7 +33,7 @@ declare namespace Tooltip {
 	}
 }
 
-declare class Tooltip extends React.Component<Tooltip.Props, {}> {}
+declare class Tooltip extends React.Component<Tooltip.Props> {}
 
 declare module "rc-tooltip" {
 	export = Tooltip
diff --git a/types/rc-tree/index.d.ts b/types/rc-tree/index.d.ts
index 873198d1b2..822e3eff7f 100644
--- a/types/rc-tree/index.d.ts
+++ b/types/rc-tree/index.d.ts
@@ -36,7 +36,7 @@ export interface TreeNodeProps extends Props<TreeNode> {
     isLeaf?: boolean;
 }
 
-export class TreeNode extends Component<TreeNodeProps, {}> { }
+export class TreeNode extends Component<TreeNodeProps> { }
 
 export interface ExpandData {
     expanded: boolean;
@@ -151,4 +151,4 @@ export interface TreeProps extends Props<Tree> {
     draggable?: boolean;
 }
 
-export default class Tree extends Component<TreeProps, {}> { }
+export default class Tree extends Component<TreeProps> { }
diff --git a/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx b/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
index f967eb2350..18eb306139 100644
--- a/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
+++ b/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as shallowCompare from 'react-addons-shallow-compare';
 
-export class MyComponent extends React.Component<{}, {}> {
+export class MyComponent extends React.Component<{}> {
     shouldComponentUpdate(nextProps: any, nextState: any, nextContext: any): boolean {
         return shallowCompare(this, nextProps, nextState);
     }
diff --git a/types/react-addons-test-utils/index.d.ts b/types/react-addons-test-utils/index.d.ts
index 54ebff6a5f..97131130eb 100644
--- a/types/react-addons-test-utils/index.d.ts
+++ b/types/react-addons-test-utils/index.d.ts
@@ -62,7 +62,7 @@ declare namespace TestUtils {
     }
 
     export interface EventSimulator {
-        (element: Element | Component<any, any>, eventData?: SyntheticEventData): void;
+        (element: Element | Component<any>, eventData?: SyntheticEventData): void;
     }
 
     export interface MockedComponentClass {
@@ -119,10 +119,10 @@ declare namespace TestUtils {
         element: DOMElement<any, T>): T;
     export function renderIntoDocument(
         element: SFCElement<any>): void;
-    export function renderIntoDocument<T extends Component<any, any>>(
+    export function renderIntoDocument<T extends Component<any>>(
         element: CElement<any, T>): T;
     export function renderIntoDocument<P>(
-        element: ReactElement<P>): Component<P, {}> | Element | void;
+        element: ReactElement<P>): Component<P> | Element | void;
 
     export function mockComponent(
         mocked: MockedComponentClass, mockTagName?: string): typeof TestUtils;
@@ -133,38 +133,38 @@ declare namespace TestUtils {
         element: ReactElement<any>, type: string): element is DOMElement<P, T>;
     export function isElementOfType<P>(
         element: ReactElement<any>, type: SFC<P>): element is SFCElement<P>;
-    export function isElementOfType<P, T extends Component<P, {}>, C extends ComponentClass<P>>(
+    export function isElementOfType<P, T extends Component<P>, C extends ComponentClass<P>>(
         element: ReactElement<any>, type: ClassType<P, T, C>): element is CElement<P, T>;
 
     export function isDOMComponent(instance: ReactInstance): instance is Element;
-    export function isCompositeComponent(instance: ReactInstance): instance is Component<any, any>;
-    export function isCompositeComponentWithType<T extends Component<any, any>, C extends ComponentClass<any>>(
+    export function isCompositeComponent(instance: ReactInstance): instance is Component<any>;
+    export function isCompositeComponentWithType<T extends Component<any>, C extends ComponentClass<any>>(
         instance: ReactInstance, type: ClassType<any, T, C>): T;
 
     export function findAllInRenderedTree(
-        root: Component<any, any>,
+        root: Component<any>,
         fn: (i: ReactInstance) => boolean): ReactInstance[];
 
     export function scryRenderedDOMComponentsWithClass(
-        root: Component<any, any>,
+        root: Component<any>,
         className: string): Element[];
     export function findRenderedDOMComponentWithClass(
-        root: Component<any, any>,
+        root: Component<any>,
         className: string): Element;
 
     export function scryRenderedDOMComponentsWithTag(
-        root: Component<any, any>,
+        root: Component<any>,
         tagName: string): Element[];
     export function findRenderedDOMComponentWithTag(
-        root: Component<any, any>,
+        root: Component<any>,
         tagName: string): Element;
 
-    export function scryRenderedComponentsWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-        root: Component<any, any>,
+    export function scryRenderedComponentsWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+        root: Component<any>,
         type: ClassType<any, T, C>): T[];
 
-    export function findRenderedComponentWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-        root: Component<any, any>,
+    export function findRenderedComponentWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+        root: Component<any>,
         type: ClassType<any, T, C>): T;
 
     export function createRenderer(): ShallowRenderer;
diff --git a/types/react-autosuggest/index.d.ts b/types/react-autosuggest/index.d.ts
index f369e8d245..2afbd1960d 100644
--- a/types/react-autosuggest/index.d.ts
+++ b/types/react-autosuggest/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.3
 
 import * as React from 'react';
-declare class Autosuggest extends React.Component<any, any> {}
+declare class Autosuggest extends React.Component<any> {}
 
 export = Autosuggest;
 
diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 266fabdc5f..646826bee4 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -42,7 +42,7 @@ declare module 'react-big-calendar' {
         elementProps?: React.HTMLAttributes<HTMLElement>;
     }
 
-    class BigCalendar extends React.Component<BigCalendarProps, {}> {
+    class BigCalendar extends React.Component<BigCalendarProps> {
         /**
          * Setup the localizer by providing the moment Object
          */
diff --git a/types/react-body-classname/index.d.ts b/types/react-body-classname/index.d.ts
index e7d0fbfdd1..6088e99cb7 100644
--- a/types/react-body-classname/index.d.ts
+++ b/types/react-body-classname/index.d.ts
@@ -8,7 +8,7 @@ import * as React from "react";
 
 export = BodyClassName;
 
-declare class BodyClassName extends React.Component<{ className: string }, any> {
+declare class BodyClassName extends React.Component<{ className: string }> {
     static canUseDOM: boolean;
     static displayName: string;
     static peek(): any;
diff --git a/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx b/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
index d37cde8fc7..ae34058dd4 100644
--- a/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
+++ b/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
@@ -6,7 +6,7 @@ const Custom: React.StatelessComponent<{}> = () => {
     return (<div />);
 };
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component<{}> {
     render() {
         return (
             <DatePicker autoFocus={ false }
diff --git a/types/react-bootstrap-daterangepicker/index.d.ts b/types/react-bootstrap-daterangepicker/index.d.ts
index 07e38760d4..aaf6a5089e 100644
--- a/types/react-bootstrap-daterangepicker/index.d.ts
+++ b/types/react-bootstrap-daterangepicker/index.d.ts
@@ -21,7 +21,7 @@ declare namespace ReactBootstrapDaterangepicker {
         onEvent?: EventHandler;
     }
 
-    export class DateRangePicker extends React.Component<Props, {}> { }
+    export class DateRangePicker extends React.Component<Props> { }
 }
 
 declare var DateRangePicker: typeof ReactBootstrapDaterangepicker.DateRangePicker;
diff --git a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts
index f287f5c041..b5d19ea449 100644
--- a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts
+++ b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts
@@ -1,7 +1,7 @@
 import DateRangePicker = require("react-bootstrap-daterangepicker");
 import * as React from "react";
 
-class IntegrationTest extends React.Component<{}, {}> {
+class IntegrationTest extends React.Component<{}> {
   render() {
     const props = {
       onEvent: (ev: any, picker: any) => true,
diff --git a/types/react-bootstrap-table/react-bootstrap-table-tests.tsx b/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
index 0b5d58166c..a432b4ffea 100644
--- a/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
+++ b/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
@@ -38,7 +38,7 @@ function enumFormatter(cell: any, row: any, enumObject: any) {
   return enumObject[cell];
 }
 
-class SelectFilterWithDefaultValue extends React.Component<any, any> {
+class SelectFilterWithDefaultValue extends React.Component<any> {
   render() {
     return (
       <BootstrapTable data={ products }>
@@ -51,7 +51,7 @@ class SelectFilterWithDefaultValue extends React.Component<any, any> {
   }
 }
 
-class TextFilterWithCondition extends React.Component<any, any> {
+class TextFilterWithCondition extends React.Component<any> {
   render() {
     return (
       <BootstrapTable data={ products }>
@@ -69,7 +69,7 @@ function getCustomFilter(filterHandler: (parameters?: ApplyFilterParameter) => v
   );
 }
 
-class CustomFilter extends React.Component<any, any> {
+class CustomFilter extends React.Component<any> {
   render() {
     return (
       <BootstrapTable data={ products }>
@@ -82,7 +82,7 @@ class CustomFilter extends React.Component<any, any> {
 }
 
 // Adopted from https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-header-span/column-header-span-complex.js
-export default class ColumnHeaderSpanComplex extends React.Component<any, any> {
+export default class ColumnHeaderSpanComplex extends React.Component<any> {
   render() {
     const selectRow = {
       mode: 'checkbox',
diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index 5e4a9d46b8..3030e7d6a5 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -47,7 +47,7 @@ declare namespace ReactBootstrap {
         footer?: any; // TODO: Add more specific type
         header?: any; // TODO: Add more specific type
     }
-    type Accordion = React.ClassicComponent<AccordionProps, {}>;
+    type Accordion = React.ClassicComponent<AccordionProps>;
     var Accordion: React.ClassicComponentClass<AccordionProps>;
 
 
@@ -58,7 +58,7 @@ declare namespace ReactBootstrap {
     interface BreadcrumbClass extends React.ClassicComponentClass<BreadcrumbProps> {
         Item: typeof BreadcrumbItem;
     }
-    type Breadcrumb = React.ClassicComponent<BreadcrumbProps, {}>;
+    type Breadcrumb = React.ClassicComponent<BreadcrumbProps>;
     var Breadcrumb: BreadcrumbClass;
 
 
@@ -70,7 +70,7 @@ declare namespace ReactBootstrap {
         title?: React.ReactNode;
         target?: string;
     }
-    type BreadcrumbItem = React.ClassicComponent<BreadcrumbItemProps, {}>;
+    type BreadcrumbItem = React.ClassicComponent<BreadcrumbItemProps>;
     var BreadcrumbItem: React.ClassicComponentClass<BreadcrumbItemProps>;
 
 
@@ -84,7 +84,7 @@ declare namespace ReactBootstrap {
         componentClass?: React.ReactType;
         disabled?: boolean;
     }
-    type Button = React.ClassicComponent<ButtonProps, {}>;
+    type Button = React.ClassicComponent<ButtonProps>;
     var Button: React.ClassicComponentClass<ButtonProps>;
 
 
@@ -96,7 +96,7 @@ declare namespace ReactBootstrap {
         justified?: boolean;
         vertical?: boolean;
     }
-    type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps, {}>;
+    type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps>;
     var ButtonToolbar: React.ClassicComponentClass<ButtonToolbarProps>;
 
 
@@ -108,7 +108,7 @@ declare namespace ReactBootstrap {
         justified?: boolean;
         vertical?: boolean;
     }
-    type ButtonGroup = React.ClassicComponent<ButtonGroupProps, {}>;
+    type ButtonGroup = React.ClassicComponent<ButtonGroupProps>;
     var ButtonGroup: React.ClassicComponentClass<ButtonGroupProps>;
 
 
@@ -120,7 +120,7 @@ declare namespace ReactBootstrap {
         role?: string;
         componentClass?: React.ReactType;
     }
-    type SafeAnchor = React.ClassicComponent<SafeAnchorProps, {}>;
+    type SafeAnchor = React.ClassicComponent<SafeAnchorProps>;
     const SafeAnchor: React.ClassicComponentClass<SafeAnchorProps>;
 
 
@@ -132,7 +132,7 @@ declare namespace ReactBootstrap {
         inputRef?: (instance: HTMLInputElement) => void;
         validationState?: "success" | "warning" | "error";
     }
-    class Checkbox extends React.Component<CheckboxProps, {}> { }
+    class Checkbox extends React.Component<CheckboxProps> { }
 
 
     // <Clearfix />
@@ -143,7 +143,7 @@ declare namespace ReactBootstrap {
         visibleMdBlock?: boolean;
         visibleLgBlock?: boolean;
     }
-    class Clearfix extends React.Component<ClearfixProps, {}> { }
+    class Clearfix extends React.Component<ClearfixProps> { }
 
 
     // <Collapse />
@@ -155,7 +155,7 @@ declare namespace ReactBootstrap {
         transitionAppear?: boolean;
         unmountOnExit?: boolean;
     }
-    class Collapse extends React.Component<CollapseProps, {}> { }
+    class Collapse extends React.Component<CollapseProps> { }
 
 
     // <Dropdown />
@@ -173,7 +173,7 @@ declare namespace ReactBootstrap {
         role?: string;
     }
     type DropdownProps = DropdownBaseProps & React.HTMLProps<Dropdown>;
-    class Dropdown extends React.Component<DropdownProps, any> {
+    class Dropdown extends React.Component<DropdownProps> {
         public static Menu: typeof DropdownMenu;
         public static Toggle: typeof DropdownToggle;
     }
@@ -189,7 +189,7 @@ declare namespace ReactBootstrap {
         pullRight?: boolean;
     }
     type DropdownButtonProps = DropdownButtonBaseProps & React.HTMLProps<DropdownButton>;
-    class DropdownButton extends React.Component<DropdownButtonProps, {}> { }
+    class DropdownButton extends React.Component<DropdownButtonProps> { }
 
 
     // <Dropdown.Menu />
@@ -200,7 +200,7 @@ declare namespace ReactBootstrap {
         open?: boolean;
         pullRight?: boolean;
     }
-    class DropdownMenu extends React.Component<DropdownMenuProps, any> { }
+    class DropdownMenu extends React.Component<DropdownMenuProps> { }
 
 
     // <Dropdown.Toggle />
@@ -213,7 +213,7 @@ declare namespace ReactBootstrap {
         bsClass?:string; // Added since v0.30.0
         bsStyle?:string;
     }
-    class DropdownToggle extends React.Component<DropdownToggleProps, any> { }
+    class DropdownToggle extends React.Component<DropdownToggleProps> { }
 
 
     // <Fade />
@@ -223,7 +223,7 @@ declare namespace ReactBootstrap {
         transitionAppear?: boolean;
         unmountOnExit?: boolean;
     }
-    class Fade extends React.Component<FadeProps, {}> { }
+    class Fade extends React.Component<FadeProps> { }
 
 
     // <MenuItem />
@@ -239,7 +239,7 @@ declare namespace ReactBootstrap {
         target?: string;
         title?: string;
     }
-    class MenuItem extends React.Component<MenuItemProps, {}> { }
+    class MenuItem extends React.Component<MenuItemProps> { }
 
 
     // <Panel />
@@ -255,7 +255,7 @@ declare namespace ReactBootstrap {
         header?: React.ReactNode;
         onSelect?: SelectCallback;
     }
-    type Panel = React.ClassicComponent<PanelProps, {}>;
+    type Panel = React.ClassicComponent<PanelProps>;
     var Panel: React.ClassicComponentClass<PanelProps>;
 
 
@@ -268,7 +268,7 @@ declare namespace ReactBootstrap {
         defaultActiveKey?: any;
         onSelect?: SelectCallback;
     }
-    type PanelGroup = React.ClassicComponent<PanelGroupProps, {}>;
+    type PanelGroup = React.ClassicComponent<PanelGroupProps>;
     var PanelGroup: React.ClassicComponentClass<PanelGroupProps>;
 
 
@@ -280,7 +280,7 @@ declare namespace ReactBootstrap {
         dropup?: boolean;
         pullRight?: boolean;
     }
-    class SplitButton extends React.Component<SplitButtonProps, {}> { }
+    class SplitButton extends React.Component<SplitButtonProps> { }
 
 
     // <Modal.Dialog />
@@ -294,7 +294,7 @@ declare namespace ReactBootstrap {
         onExited?: Function;
         onExiting?: Function;
     }
-    type ModalDialog = React.ClassicComponent<ModalDialogProps, {}>;
+    type ModalDialog = React.ClassicComponent<ModalDialogProps>;
     var ModalDialog: React.ClassicComponentClass<ModalDialogProps>;
 
 
@@ -305,7 +305,7 @@ declare namespace ReactBootstrap {
         onHide?: Function;
         // undefined?: string;
     }
-    class ModalHeader extends React.Component<ModalHeaderProps, {}> {
+    class ModalHeader extends React.Component<ModalHeaderProps> {
     }
 
 
@@ -313,21 +313,21 @@ declare namespace ReactBootstrap {
     interface ModalTitleProps extends React.HTMLProps<ModalTitle> {
         modalClassName?: string;
     }
-    class ModalTitle extends React.Component<ModalTitleProps, {}> {
+    class ModalTitle extends React.Component<ModalTitleProps> {
     }
 
     // <Modal.Body />
     interface ModalBodyProps extends React.HTMLProps<ModalBody> {
         modalClassName?: string;
     }
-    class ModalBody extends React.Component<ModalBodyProps, {}> {
+    class ModalBody extends React.Component<ModalBodyProps> {
     }
 
     // <Modal.Footer />
     interface ModalFooterProps extends React.HTMLProps<ModalFooter> {
         modalClassName?: string;
     }
-    class ModalFooter extends React.Component<ModalFooterProps, {}> {
+    class ModalFooter extends React.Component<ModalFooterProps> {
     }
 
     // <Modal />
@@ -369,7 +369,7 @@ declare namespace ReactBootstrap {
         Footer: typeof ModalFooter;
         Dialog: typeof ModalDialog;
     }
-    type Modal = React.ClassicComponent<ModalProps, {}>;
+    type Modal = React.ClassicComponent<ModalProps>;
     var Modal: ModalClass;
 
     // <OverlayTrigger />
@@ -395,7 +395,7 @@ declare namespace ReactBootstrap {
         rootClose?: boolean;
         trigger?: string | string[];
     }
-    type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps, {}>;
+    type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps>;
     var OverlayTrigger: React.ClassicComponentClass<OverlayTriggerProps>;
 
     // <Tooltip />
@@ -409,7 +409,7 @@ declare namespace ReactBootstrap {
         positionLeft?: number;
         positionTop?: number;
     }
-    type Tooltip = React.ClassicComponent<TooltipProps, {}>;
+    type Tooltip = React.ClassicComponent<TooltipProps>;
     var Tooltip: React.ClassicComponentClass<TooltipProps>;
 
     // <Popover/>
@@ -423,7 +423,7 @@ declare namespace ReactBootstrap {
         positionLeft?: number | string; // String support added since v0.30.0
         positionTop?: number | string; // String support added since v0.30.0
     }
-    type Popover = React.ClassicComponent<PopoverProps, {}>;
+    type Popover = React.ClassicComponent<PopoverProps>;
     var Popover: React.ClassicComponentClass<PopoverProps>;
 
     // <Overlay />
@@ -445,7 +445,7 @@ declare namespace ReactBootstrap {
         target?: Function | React.ReactInstance;
         shouldUpdatePosition?: boolean;
     }
-    class Overlay extends React.Component<OverlayProps, {}> {
+    class Overlay extends React.Component<OverlayProps> {
     }
 
     // <ProgressBar />
@@ -461,7 +461,7 @@ declare namespace ReactBootstrap {
         srOnly?: boolean;
         striped?: boolean;
     }
-    class ProgressBar extends React.Component<ProgressBarProps, {}> {
+    class ProgressBar extends React.Component<ProgressBarProps> {
     }
 
     // <Nav />
@@ -483,7 +483,7 @@ declare namespace ReactBootstrap {
         ulClassName?: string;
         ulId?: string;
     }
-    class Nav extends React.Component<NavProps, {}> {
+    class Nav extends React.Component<NavProps> {
     }
 
     // <NavItem />
@@ -507,32 +507,32 @@ declare namespace ReactBootstrap {
         toggleButton?: any; // TODO: Add more specific type
         toggleNavKey?: string | number;
     }
-    type NavItem = React.ClassicComponent<NavItemProps, {}>;
+    type NavItem = React.ClassicComponent<NavItemProps>;
     var NavItem: React.ClassicComponentClass<NavItemProps>;
 
     // <Navbar.Brand />
     interface NavbarBrandProps extends React.HTMLProps<NavbarBrand> {
     }
-    class NavbarBrand extends React.Component<NavbarBrandProps, {}> {
+    class NavbarBrand extends React.Component<NavbarBrandProps> {
     }
 
     // <Navbar.Collapse />
     interface NavbarCollapseProps {
     }
-    type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps, {}>;
+    type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps>;
     var NavbarCollapse: React.ClassicComponentClass<NavbarCollapseProps>;
 
     // <Navbar.Header />
     interface NavbarHeaderProps extends React.HTMLProps<NavbarHeader> {
     }
-    type NavbarHeader = React.ClassicComponent<NavbarHeaderProps, {}>;
+    type NavbarHeader = React.ClassicComponent<NavbarHeaderProps>;
     var NavbarHeader: React.ClassicComponentClass<NavbarHeaderProps>;
 
     // <Navbar.Toggle />
     interface NavbarToggleProps {
         onClick?: React.MouseEventHandler<HTMLButtonElement>;
     }
-    type NavbarToggle = React.ClassicComponent<NavbarToggleProps, {}>;
+    type NavbarToggle = React.ClassicComponent<NavbarToggleProps>;
     var NavbarToggle: React.ClassicComponentClass<NavbarToggleProps>;
 
     // <Navbar.Link />
@@ -540,14 +540,14 @@ declare namespace ReactBootstrap {
         href: string;
         onClick?: React.MouseEventHandler<HTMLAnchorElement>;
     }
-    type NavbarLink = React.ClassicComponent<NavbarLinkProps, {}>;
+    type NavbarLink = React.ClassicComponent<NavbarLinkProps>;
     const NavbarLink: React.ClassicComponentClass<NavbarLinkProps>;
 
     // <Navbar.Text />
     interface NavbarTextProps {
         pullRight?: boolean;
     }
-    type NavbarText = React.ClassicComponent<NavbarTextProps, {}>;
+    type NavbarText = React.ClassicComponent<NavbarTextProps>;
     const NavbarText: React.ClassicComponentClass<NavbarTextProps>;
 
     // <Navbar.Form />
@@ -555,7 +555,7 @@ declare namespace ReactBootstrap {
         componentClass?: React.ReactType;
         pullRight?: boolean;
     }
-    type NavbarForm = React.ClassicComponent<NavbarFormProps, {}>;
+    type NavbarForm = React.ClassicComponent<NavbarFormProps>;
     const NavbarForm: React.ClassicComponentClass<NavbarFormProps>;
 
     // <Navbar />
@@ -585,7 +585,7 @@ declare namespace ReactBootstrap {
         Text: typeof NavbarText;
         Form: typeof NavbarForm;
     }
-    type Navbar = React.ClassicComponent<NavbarProps, {}>;
+    type Navbar = React.ClassicComponent<NavbarProps>;
     var Navbar: NavbarClass;
 
 
@@ -596,7 +596,7 @@ declare namespace ReactBootstrap {
         eventKey?: any;
     }
     type NavDropdownProps = NavDropdownBaseProps & React.HTMLProps<NavDropdown>;
-    class NavDropdown extends React.Component<NavDropdownProps, {}> { }
+    class NavDropdown extends React.Component<NavDropdownProps> { }
 
     // <Tabs />
     interface TabsProps extends React.HTMLProps<Tabs> {
@@ -611,7 +611,7 @@ declare namespace ReactBootstrap {
         unmountOnExit?: boolean;
         justified?: boolean;
     }
-    type Tabs = React.ClassicComponent<TabsProps, {}>;
+    type Tabs = React.ClassicComponent<TabsProps>;
     var Tabs: React.ClassicComponentClass<TabsProps>;
 
     // <Tab />
@@ -671,7 +671,7 @@ declare namespace ReactBootstrap {
     interface PagerClass extends React.ClassicComponentClass<PagerProps> {
         Item: typeof PageItem // Added since v0.30.0
     }
-    type Pager = React.ClassicComponent<PagerProps, {}>;
+    type Pager = React.ClassicComponent<PagerProps>;
     var Pager: PagerClass;
 
 
@@ -684,7 +684,7 @@ declare namespace ReactBootstrap {
         previous?: boolean;
         target?: string;
     }
-    type PageItem = React.ClassicComponent<PageItemProps, {}>;
+    type PageItem = React.ClassicComponent<PageItemProps>;
     /** @deprecated since v0.30.0, should use <Pager.Item> instead of <PageItem>*/
     var PageItem: React.ClassicComponentClass<PageItemProps>;
 
@@ -705,7 +705,7 @@ declare namespace ReactBootstrap {
         onSelect?: SelectCallback;
         prev?: React.ReactNode;
     }
-    type Pagination = React.ClassicComponent<PaginationProps, {}>;
+    type Pagination = React.ClassicComponent<PaginationProps>;
     var Pagination: React.ClassicComponentClass<PaginationProps>;
 
 
@@ -717,7 +717,7 @@ declare namespace ReactBootstrap {
         /** @deprecated since v0.29.0 */ dismissAfter?: number;
         onDismiss?: Function;
     }
-    type Alert = React.ClassicComponent<AlertProps, {}>;
+    type Alert = React.ClassicComponent<AlertProps>;
     var Alert: React.ClassicComponentClass<AlertProps>;
 
 
@@ -743,7 +743,7 @@ declare namespace ReactBootstrap {
         Caption: typeof CarouselCaption;
         Item: typeof CarouselItem;
     }
-    type Carousel = React.ClassicComponent<CarouselProps, {}>;
+    type Carousel = React.ClassicComponent<CarouselProps>;
     var Carousel: CarouselClass;
 
     // <CarouselItem />
@@ -755,14 +755,14 @@ declare namespace ReactBootstrap {
         index?: number;
         onAnimateOutEnd?: Function;
     }
-    type CarouselItem = React.ClassicComponent<CarouselItemProps, {}>;
+    type CarouselItem = React.ClassicComponent<CarouselItemProps>;
     var CarouselItem: React.ClassicComponentClass<CarouselItemProps>;
 
     // <CarouselCaption />
     interface CarouselCaptionProps extends React.HTMLProps<CarouselCaption> {
         componentClass?: React.ReactType;
     }
-    type CarouselCaption = React.ClassicComponent<CarouselCaptionProps, {}>;
+    type CarouselCaption = React.ClassicComponent<CarouselCaptionProps>;
     var CarouselCaption: React.ClassicComponentClass<CarouselCaptionProps>;
 
     // <Grid />
@@ -771,14 +771,14 @@ declare namespace ReactBootstrap {
         fluid?: boolean;
         bsClass?: string;
     }
-    type Grid = React.ClassicComponent<GridProps, {}>;
+    type Grid = React.ClassicComponent<GridProps>;
     var Grid: React.ClassicComponentClass<GridProps>;
 
     // <Row />
     interface RowProps extends React.HTMLProps<Row> {
         componentClass?: React.ReactType;
     }
-    type Row = React.ClassicComponent<RowProps, {}>;
+    type Row = React.ClassicComponent<RowProps>;
     var Row: React.ClassicComponentClass<RowProps>;
 
     // <Col />
@@ -805,7 +805,7 @@ declare namespace ReactBootstrap {
         xsPull?: number;
         xsPush?: number;
     }
-    type Col = React.ClassicComponent<ColProps, {}>;
+    type Col = React.ClassicComponent<ColProps>;
     var Col: React.ClassicComponentClass<ColProps>;
 
     // <Thumbnail />
@@ -813,7 +813,7 @@ declare namespace ReactBootstrap {
         bsSize?: Sizes;
         bsStyle?: string;
     }
-    type Thumbnail = React.ClassicComponent<ThumbnailProps, {}>;
+    type Thumbnail = React.ClassicComponent<ThumbnailProps>;
     var Thumbnail: React.ClassicComponentClass<ThumbnailProps>;
 
     // <ListGroup />
@@ -821,7 +821,7 @@ declare namespace ReactBootstrap {
         componentClass?: React.ReactType; // Added since v0.30.0
         fill?: boolean; // TODO: Add more specific type
     }
-    class ListGroup extends React.Component<ListGroupProps, {}> {
+    class ListGroup extends React.Component<ListGroupProps> {
     }
 
     // <ListGroupItem />
@@ -834,7 +834,7 @@ declare namespace ReactBootstrap {
         key?: any; // TODO: Add more specific type
         listItem?: boolean;
     }
-    class ListGroupItem extends React.Component<ListGroupItemProps, {}> {
+    class ListGroupItem extends React.Component<ListGroupItemProps> {
     }
 
     // <Label />
@@ -842,21 +842,21 @@ declare namespace ReactBootstrap {
         bsSize?: Sizes;
         bsStyle?: string;
     }
-    class Label extends React.Component<LabelProps, {}> {
+    class Label extends React.Component<LabelProps> {
     }
 
     // <Badge />
     interface BadgeProps extends React.HTMLProps<Badge> {
         pullRight?: boolean;
     }
-    type Badge = React.ClassicComponent<BadgeProps, {}>;
+    type Badge = React.ClassicComponent<BadgeProps>;
     var Badge: React.ClassicComponentClass<BadgeProps>;
 
     // <Jumbotron />
     interface JumbotronProps extends React.HTMLProps<Jumbotron> {
         componentClass?: React.ReactType;
     }
-    type Jumbotron = React.ClassicComponent<JumbotronProps, {}>;
+    type Jumbotron = React.ClassicComponent<JumbotronProps>;
     var Jumbotron: React.ClassicComponentClass<JumbotronProps>;
 
     // <Image />
@@ -866,7 +866,7 @@ declare namespace ReactBootstrap {
         rounded?: boolean;
         thumbnail?: boolean;
     }
-    type Image = React.ClassicComponent<ImageProps, {}>;
+    type Image = React.ClassicComponent<ImageProps>;
     var Image: React.ClassicComponentClass<ImageProps>;
 
     // <ResponsiveEmbed />
@@ -875,13 +875,13 @@ declare namespace ReactBootstrap {
         a4by3?: boolean;
         bsClass?: string;
     }
-    class ResponsiveEmbed extends React.Component<ResponsiveEmbedProps, {}> {
+    class ResponsiveEmbed extends React.Component<ResponsiveEmbedProps> {
     }
 
     // <PageHeader />
     interface PageHeaderProps extends React.HTMLProps<PageHeader> {
     }
-    class PageHeader extends React.Component<PageHeaderProps, {}> {
+    class PageHeader extends React.Component<PageHeaderProps> {
     }
 
     // <Well />
@@ -889,7 +889,7 @@ declare namespace ReactBootstrap {
         bsSize?: Sizes;
         bsStyle?: string;
     }
-    class Well extends React.Component<WellProps, {}> {
+    class Well extends React.Component<WellProps> {
     }
 
     // <Glyphicon />
@@ -897,7 +897,7 @@ declare namespace ReactBootstrap {
         // Required
         glyph: string;
     }
-    type Glyphicon = React.ClassicComponent<GlyphiconProps, {}>;
+    type Glyphicon = React.ClassicComponent<GlyphiconProps>;
     var Glyphicon: React.ClassicComponentClass<GlyphiconProps>;
 
     // <Table />
@@ -909,7 +909,7 @@ declare namespace ReactBootstrap {
         striped?: boolean;
         fill?: boolean;
     }
-    type Table = React.ClassicComponent<TableProps, {}>;
+    type Table = React.ClassicComponent<TableProps>;
     var Table: React.ClassicComponentClass<TableProps>;
 
     // <InputGroup />
@@ -921,19 +921,19 @@ declare namespace ReactBootstrap {
         Addon: typeof InputGroupAddon;
         Button: typeof InputGroupButton;
     }
-    type InputGroup = React.Component<InputGroupProps, {}>;
+    type InputGroup = React.Component<InputGroupProps>;
     var InputGroup: InputGroupClass;
 
 
     // <InputGroup.Addon />
     interface InputGroupAddonProps extends React.HTMLProps<InputGroupAddon> { }
-    type InputGroupAddon = React.ClassicComponent<InputGroupAddonProps, {}>;
+    type InputGroupAddon = React.ClassicComponent<InputGroupAddonProps>;
     var InputGroupAddon: React.ClassicComponentClass<InputGroupAddonProps>;
 
 
     // <InputGroup.Button />
     interface InputGroupButtonProps extends React.HTMLProps<InputGroupButton> { }
-    type InputGroupButton = React.ClassicComponent<InputGroupButtonProps, {}>;
+    type InputGroupButton = React.ClassicComponent<InputGroupButtonProps>;
     var InputGroupButton: React.ClassicComponentClass<InputGroupButtonProps>;
 
 
@@ -944,7 +944,7 @@ declare namespace ReactBootstrap {
         horizontal?: boolean;
         inline?: boolean;
     }
-    class Form extends React.Component<FormProps, {}> { }
+    class Form extends React.Component<FormProps> { }
 
     // <FormGroup />
     interface FormGroupProps extends React.HTMLProps<FormGroup> {
@@ -953,7 +953,7 @@ declare namespace ReactBootstrap {
         controlId?: string;
         validationState?: "success" | "warning" | "error";
     }
-    class FormGroup extends React.Component<FormGroupProps, {}> { }
+    class FormGroup extends React.Component<FormGroupProps> { }
 
     // <ControlLabel />
     interface ControlLabelProps extends React.HTMLProps<ControlLabel> {
@@ -961,7 +961,7 @@ declare namespace ReactBootstrap {
         htmlFor?: string;
         srOnly?: boolean;
     }
-    class ControlLabel extends React.Component<ControlLabelProps, {}> { }
+    class ControlLabel extends React.Component<ControlLabelProps> { }
 
     // <FormControl />
     interface FormControlProps extends React.HTMLProps<FormControl> {
@@ -976,13 +976,13 @@ declare namespace ReactBootstrap {
         Feedback: typeof FormControlFeedback;
         Static: typeof FormControlStatic;
     }
-    type FormControl = React.Component<FormControlProps, {}>;
+    type FormControl = React.Component<FormControlProps>;
     var FormControl: FormControlClass;
 
     // <FormControl.Feedback />
     interface FormControlFeedbackProps extends React.HTMLProps<FormControlFeedback> {
     }
-    class FormControlFeedback extends React.Component<FormControlFeedbackProps, {}> {
+    class FormControlFeedback extends React.Component<FormControlFeedbackProps> {
     }
 
     // <FormControl.Static />
@@ -990,14 +990,14 @@ declare namespace ReactBootstrap {
         bsClass?: string;
         componentClass?: React.ReactType;
     }
-    class FormControlStatic extends React.Component<FormControlStaticProps, {}> { }
+    class FormControlStatic extends React.Component<FormControlStaticProps> { }
 
 
     // <HelpBlock />
     interface HelpBlockProps extends React.HTMLProps<HelpBlock> {
         bsClass?: string;
     }
-    class HelpBlock extends React.Component<HelpBlockProps, {}> { }
+    class HelpBlock extends React.Component<HelpBlockProps> { }
 
 
     // <Radio />
@@ -1008,7 +1008,7 @@ declare namespace ReactBootstrap {
         inputRef?: (instance: HTMLInputElement) => void;
         validationState?: "success" | "warning" | "error";
     }
-    class Radio extends React.Component<RadioProps, {}> { }
+    class Radio extends React.Component<RadioProps> { }
 
 
     // <Portal />
@@ -1027,7 +1027,7 @@ declare namespace ReactBootstrap {
         transitionAppear?: boolean;
         unmountOnExit?: boolean;
     }
-    type Portal = React.ClassicComponent<PortalProps, {}>;
+    type Portal = React.ClassicComponent<PortalProps>;
     var Portal: React.ClassicComponentClass<PortalProps>;
 
     // <Position />
@@ -1040,47 +1040,47 @@ declare namespace ReactBootstrap {
         transitionAppear?: boolean;
         unmountOnExit?: boolean;
     }
-    class Position extends React.Component<PositionProps, {}> {
+    class Position extends React.Component<PositionProps> {
     }
     // <Media.Left />
     interface MediaLeftProps {
         align?: string;
     }
-    type MediaLeft = React.ClassicComponent<MediaLeftProps, {}>;
+    type MediaLeft = React.ClassicComponent<MediaLeftProps>;
     var MediaLeft: React.ClassicComponentClass<MediaLeftProps>;
 
     // <Media.Right />
     interface MediaRightProps {
         align?: string;
     }
-    type MediaRight = React.ClassicComponent<MediaRightProps, {}>;
+    type MediaRight = React.ClassicComponent<MediaRightProps>;
     var MediaRight: React.ClassicComponentClass<MediaRightProps>;
 
     // <Media.Heading />
     interface MediaHeadingProps {
         componentClass?: React.ReactType;
     }
-    type MediaHeading = React.ClassicComponent<MediaHeadingProps, {}>;
+    type MediaHeading = React.ClassicComponent<MediaHeadingProps>;
     var MediaHeading: React.ClassicComponentClass<MediaHeadingProps>;
 
     // <Media.Body />
     interface MediaBodyProps {
         componentClass?: React.ReactType;
     }
-    type MediaBody = React.ClassicComponent<MediaBodyProps, {}>;
+    type MediaBody = React.ClassicComponent<MediaBodyProps>;
     var MediaBody: React.ClassicComponentClass<MediaBodyProps>;
 
     // <Media.List />
     interface MediaListProps {
     }
-    type MediaList = React.ClassicComponent<MediaListProps, {}>;
+    type MediaList = React.ClassicComponent<MediaListProps>;
     var MediaList: React.ClassicComponentClass<MediaListProps>;
 
     // <Media.ListItem />
     interface MediaListItemProps {
         componentClass?: React.ReactType;
     }
-    type MediaListItem = React.ClassicComponent<MediaListItemProps, {}>;
+    type MediaListItem = React.ClassicComponent<MediaListItemProps>;
     var MediaListItem: React.ClassicComponentClass<MediaListItemProps>;
 
     // <Media />
@@ -1095,7 +1095,7 @@ declare namespace ReactBootstrap {
         List: typeof MediaList;
         ListItem: typeof MediaListItem;
     }
-    type Media = React.ClassicComponent<MediaProps, {}>;
+    type Media = React.ClassicComponent<MediaProps>;
     var Media: MediaClass;
 
     /* Utils */
diff --git a/types/react-bootstrap/react-bootstrap-tests.tsx b/types/react-bootstrap/react-bootstrap-tests.tsx
index 14784f9a3d..dfb74033eb 100644
--- a/types/react-bootstrap/react-bootstrap-tests.tsx
+++ b/types/react-bootstrap/react-bootstrap-tests.tsx
@@ -16,7 +16,7 @@ import {
 } from 'react-bootstrap';
 
 
-export class ReactBootstrapTest extends Component<any, any> {
+export class ReactBootstrapTest extends Component<any> {
     callback() {
         alert('Callback: ' + JSON.stringify(arguments));
     }
diff --git a/types/react-breadcrumbs/react-breadcrumbs-tests.tsx b/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
index d81877fccf..b8a51bf36e 100644
--- a/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
+++ b/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
@@ -7,7 +7,7 @@ interface MyComponentProps extends ReactRouter.RouteComponentProps<{}, { id: num
 }
 
 
-class MyComponent extends React.Component<MyComponentProps, {}> {
+class MyComponent extends React.Component<MyComponentProps> {
     render() {
         return (
             <div>
diff --git a/types/react-bytesize-icons/index.d.ts b/types/react-bytesize-icons/index.d.ts
index c0beba0001..d1176b810b 100644
--- a/types/react-bytesize-icons/index.d.ts
+++ b/types/react-bytesize-icons/index.d.ts
@@ -16,7 +16,7 @@ interface BytesizeIconsProps extends React.Props<any> {
     strokeLinecap?: StrokeLinecap;
     color?: string;
 }
-export class BytesizeIconComponent extends React.Component<BytesizeIconsProps, {}> {}
+export class BytesizeIconComponent extends React.Component<BytesizeIconsProps> {}
 
 export class Activity extends BytesizeIconComponent {}
 export class Alert extends BytesizeIconComponent {}
diff --git a/types/react-calendar-timeline/react-calendar-timeline-tests.tsx b/types/react-calendar-timeline/react-calendar-timeline-tests.tsx
index f2bd8efab4..b699682399 100644
--- a/types/react-calendar-timeline/react-calendar-timeline-tests.tsx
+++ b/types/react-calendar-timeline/react-calendar-timeline-tests.tsx
@@ -14,7 +14,7 @@ const items = [
   {id: 3, group: 1, title: 'item 3', start_time: moment().add(2, 'hour'), end_time: moment().add(3, 'hour')}
 ]
 
-class ExampleOfUsingReactCalendarTimeline extends React.Component<{}, {}> {
+class ExampleOfUsingReactCalendarTimeline extends React.Component<{}> {
      render(){
          return(
              <div>
diff --git a/types/react-chartjs-2/index.d.ts b/types/react-chartjs-2/index.d.ts
index 604b157478..d6b0fe41c4 100644
--- a/types/react-chartjs-2/index.d.ts
+++ b/types/react-chartjs-2/index.d.ts
@@ -29,7 +29,7 @@ export interface LinearComponentProps extends ChartComponentProps {
     data: ChartData<chartjs.ChartData>;
 }
 
-export default class ChartComponent<P extends ChartComponentProps> extends React.Component<P, {}> {
+export default class ChartComponent<P extends ChartComponentProps> extends React.Component<P> {
     chart_instance: chartjs;
 }
 
diff --git a/types/react-chartjs-2/test/dynamic-doughnut.tsx b/types/react-chartjs-2/test/dynamic-doughnut.tsx
index 8c22df6e4a..efbe69b70f 100755
--- a/types/react-chartjs-2/test/dynamic-doughnut.tsx
+++ b/types/react-chartjs-2/test/dynamic-doughnut.tsx
@@ -26,7 +26,7 @@ const getState = () => ({
   }]
 });
 
-export default class DynamicDoughnutExample extends React.Component<any, any> {
+export default class DynamicDoughnutExample extends React.Component<any> {
   getInitialState() {
     return getState();
   }
diff --git a/types/react-chartjs-2/test/index.tsx b/types/react-chartjs-2/test/index.tsx
index 0376218e1d..3ce84a224e 100644
--- a/types/react-chartjs-2/test/index.tsx
+++ b/types/react-chartjs-2/test/index.tsx
@@ -13,7 +13,7 @@ import BubbleExample from './bubble';
 import MixedDataExample from './mix';
 import RandomizedDataLineExample from './randomizedLine';
 
-class App extends React.Component<any, any> {
+class App extends React.Component<any> {
 	render() {
 		return (
 			<div>
diff --git a/types/react-codemirror/index.d.ts b/types/react-codemirror/index.d.ts
index f7208438ea..2a9eae6667 100644
--- a/types/react-codemirror/index.d.ts
+++ b/types/react-codemirror/index.d.ts
@@ -19,7 +19,7 @@ declare namespace ReactCodeMirror {
         codeMirrorInstance?: CodeMirror.Editor; // the CodeMirror instance
     }
 
-    interface ReactCodeMirror extends React.Component<ReactCodeMirrorProps, {}> {
+    interface ReactCodeMirror extends React.Component<ReactCodeMirrorProps> {
         /** Focuses the CodeMirror instance. */
         focus(): void;
 
diff --git a/types/react-codemirror/react-codemirror-tests.tsx b/types/react-codemirror/react-codemirror-tests.tsx
index 2924ae4d5c..a5be69d882 100644
--- a/types/react-codemirror/react-codemirror-tests.tsx
+++ b/types/react-codemirror/react-codemirror-tests.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as Codemirror from "react-codemirror";
 
-class CodemirrorTest extends React.Component<React.Props<{}>, {}> {
+class CodemirrorTest extends React.Component<React.Props<{}>> {
     private editorRef: ReactCodeMirror.ReactCodeMirror;
 
     componentDidMount() {
diff --git a/types/react-color/lib/components/alpha/Alpha.d.ts b/types/react-color/lib/components/alpha/Alpha.d.ts
index 2856f077b9..c3d5f278ca 100644
--- a/types/react-color/lib/components/alpha/Alpha.d.ts
+++ b/types/react-color/lib/components/alpha/Alpha.d.ts
@@ -6,4 +6,4 @@ export interface AlphaPickerProps extends ColorPickerProps<AlphaPicker> {
     width?: string;
 }
 
-export default class AlphaPicker extends Component<AlphaPickerProps, any> {}
+export default class AlphaPicker extends Component<AlphaPickerProps> {}
diff --git a/types/react-color/lib/components/block/Block.d.ts b/types/react-color/lib/components/block/Block.d.ts
index edb3c72347..9b3633265b 100644
--- a/types/react-color/lib/components/block/Block.d.ts
+++ b/types/react-color/lib/components/block/Block.d.ts
@@ -6,4 +6,4 @@ export interface BlockPickerProps extends ColorPickerProps<BlockPicker> {
     width?: string;
 }
 
-export default class BlockPicker extends Component<BlockPickerProps, any> {}
+export default class BlockPicker extends Component<BlockPickerProps> {}
diff --git a/types/react-color/lib/components/chrome/Chrome.d.ts b/types/react-color/lib/components/chrome/Chrome.d.ts
index fa214d1b14..4493173845 100644
--- a/types/react-color/lib/components/chrome/Chrome.d.ts
+++ b/types/react-color/lib/components/chrome/Chrome.d.ts
@@ -5,4 +5,4 @@ export interface ChromePickerProps extends ColorPickerProps<ChromePicker> {
     disableAlpha?: boolean;
 }
 
-export default class ChromePicker extends Component<ChromePickerProps, any> {}
+export default class ChromePicker extends Component<ChromePickerProps> {}
diff --git a/types/react-color/lib/components/circle/Circle.d.ts b/types/react-color/lib/components/circle/Circle.d.ts
index 204842d72a..045c5a93bb 100644
--- a/types/react-color/lib/components/circle/Circle.d.ts
+++ b/types/react-color/lib/components/circle/Circle.d.ts
@@ -6,4 +6,4 @@ export interface CirclePickerProps extends ColorPickerProps<CirclePicker> {
     width?: string;
 }
 
-export default class CirclePicker extends Component<CirclePickerProps, any> {}
+export default class CirclePicker extends Component<CirclePickerProps> {}
diff --git a/types/react-color/lib/components/common/Alpha.d.ts b/types/react-color/lib/components/common/Alpha.d.ts
index da20010497..a86a6c4231 100644
--- a/types/react-color/lib/components/common/Alpha.d.ts
+++ b/types/react-color/lib/components/common/Alpha.d.ts
@@ -3,4 +3,4 @@ import { CustomPickerProps } from "react-color";
 
 export type AlphaProps = CustomPickerProps<Alpha>;
 
-export default class Alpha extends Component<AlphaProps, any> {}
+export default class Alpha extends Component<AlphaProps> {}
diff --git a/types/react-color/lib/components/common/Checkboard.d.ts b/types/react-color/lib/components/common/Checkboard.d.ts
index 40d8f26913..96cf0d56f4 100644
--- a/types/react-color/lib/components/common/Checkboard.d.ts
+++ b/types/react-color/lib/components/common/Checkboard.d.ts
@@ -6,4 +6,4 @@ export interface CheckboardProps extends ClassAttributes<Checkboard> {
     white?: string;
 }
 
-export default class Checkboard extends Component<CheckboardProps, any> {}
+export default class Checkboard extends Component<CheckboardProps> {}
diff --git a/types/react-color/lib/components/common/EditableInput.d.ts b/types/react-color/lib/components/common/EditableInput.d.ts
index 931ec7acdc..d1c5154c90 100644
--- a/types/react-color/lib/components/common/EditableInput.d.ts
+++ b/types/react-color/lib/components/common/EditableInput.d.ts
@@ -17,4 +17,4 @@ export interface EditableInputProps extends ClassAttributes<EditableInput> {
     dragMax?: string;
 }
 
-export default class EditableInput extends Component<EditableInputProps, any> {}
+export default class EditableInput extends Component<EditableInputProps> {}
diff --git a/types/react-color/lib/components/common/Hue.d.ts b/types/react-color/lib/components/common/Hue.d.ts
index 1f61841107..741db9e95f 100644
--- a/types/react-color/lib/components/common/Hue.d.ts
+++ b/types/react-color/lib/components/common/Hue.d.ts
@@ -5,4 +5,4 @@ export interface HueProps extends CustomPickerProps<Hue> {
     direction?: "horizontal" | "vertical";
 }
 
-export default class Hue extends Component<HueProps, any> {}
+export default class Hue extends Component<HueProps> {}
diff --git a/types/react-color/lib/components/common/Saturation.d.ts b/types/react-color/lib/components/common/Saturation.d.ts
index c90a7d9685..a58e47179d 100644
--- a/types/react-color/lib/components/common/Saturation.d.ts
+++ b/types/react-color/lib/components/common/Saturation.d.ts
@@ -3,4 +3,4 @@ import { CustomPickerProps } from "react-color";
 
 export type SaturationProps = CustomPickerProps<Saturation>;
 
-export default class Saturation extends Component<SaturationProps, any> {}
+export default class Saturation extends Component<SaturationProps> {}
diff --git a/types/react-color/lib/components/compact/Compact.d.ts b/types/react-color/lib/components/compact/Compact.d.ts
index 3f9ff74f60..a661972a41 100644
--- a/types/react-color/lib/components/compact/Compact.d.ts
+++ b/types/react-color/lib/components/compact/Compact.d.ts
@@ -5,4 +5,4 @@ export interface CompactPickerProps extends ColorPickerProps<CompactPicker> {
     colors?: string[];
 }
 
-export default class CompactPicker extends Component<CompactPickerProps, any> {}
+export default class CompactPicker extends Component<CompactPickerProps> {}
diff --git a/types/react-color/lib/components/github/Github.d.ts b/types/react-color/lib/components/github/Github.d.ts
index 05df2f01a9..c4b6e7c27c 100644
--- a/types/react-color/lib/components/github/Github.d.ts
+++ b/types/react-color/lib/components/github/Github.d.ts
@@ -7,4 +7,4 @@ export interface GithubPickerProps extends ColorPickerProps<GithubPicker> {
     triangle?: 'hide' | 'top-left' | 'top-right';
 }
 
-export default class GithubPicker extends Component<GithubPickerProps, any> {}
+export default class GithubPicker extends Component<GithubPickerProps> {}
diff --git a/types/react-color/lib/components/hue/Hue.d.ts b/types/react-color/lib/components/hue/Hue.d.ts
index 6aab83baea..a8ff4d60dd 100644
--- a/types/react-color/lib/components/hue/Hue.d.ts
+++ b/types/react-color/lib/components/hue/Hue.d.ts
@@ -6,4 +6,4 @@ export interface HuePickerProps extends ColorPickerProps<HuePicker> {
     width?: string;
 }
 
-export default class HuePicker extends Component<HuePickerProps, any> {}
+export default class HuePicker extends Component<HuePickerProps> {}
diff --git a/types/react-color/lib/components/material/Material.d.ts b/types/react-color/lib/components/material/Material.d.ts
index 4ae849b910..46b42ba5ad 100644
--- a/types/react-color/lib/components/material/Material.d.ts
+++ b/types/react-color/lib/components/material/Material.d.ts
@@ -3,4 +3,4 @@ import { ColorPickerProps } from "react-color";
 
 export type MaterialPickerProps = ColorPickerProps<MaterialPicker>;
 
-export default class MaterialPicker extends Component<MaterialPickerProps, any> {}
+export default class MaterialPicker extends Component<MaterialPickerProps> {}
diff --git a/types/react-color/lib/components/photoshop/Photoshop.d.ts b/types/react-color/lib/components/photoshop/Photoshop.d.ts
index c3abaf0ccd..6e544d4969 100644
--- a/types/react-color/lib/components/photoshop/Photoshop.d.ts
+++ b/types/react-color/lib/components/photoshop/Photoshop.d.ts
@@ -7,4 +7,4 @@ export interface PhotoshopPickerProps extends ColorPickerProps<PhotoshopPicker>
     onCancel?: ColorChangeHandler;
 }
 
-export default class PhotoshopPicker extends Component<PhotoshopPickerProps, any> {}
+export default class PhotoshopPicker extends Component<PhotoshopPickerProps> {}
diff --git a/types/react-color/lib/components/sketch/Sketch.d.ts b/types/react-color/lib/components/sketch/Sketch.d.ts
index 229b2b2b51..3a1ac6c3fe 100644
--- a/types/react-color/lib/components/sketch/Sketch.d.ts
+++ b/types/react-color/lib/components/sketch/Sketch.d.ts
@@ -7,4 +7,4 @@ export interface SketchPickerProps extends ColorPickerProps<SketchPicker> {
     width?: string;
 }
 
-export default class SketchPicker extends Component<SketchPickerProps, any> {}
+export default class SketchPicker extends Component<SketchPickerProps> {}
diff --git a/types/react-color/lib/components/slider/Slider.d.ts b/types/react-color/lib/components/slider/Slider.d.ts
index 913f30692a..1832cc7f24 100644
--- a/types/react-color/lib/components/slider/Slider.d.ts
+++ b/types/react-color/lib/components/slider/Slider.d.ts
@@ -3,4 +3,4 @@ import { ColorPickerProps } from "react-color";
 
 export type SliderPickerProps = ColorPickerProps<SliderPicker>;
 
-export default class SliderPicker extends Component<SliderPickerProps, any> {}
+export default class SliderPicker extends Component<SliderPickerProps> {}
diff --git a/types/react-color/lib/components/swatches/Swatches.d.ts b/types/react-color/lib/components/swatches/Swatches.d.ts
index 22e9d1704c..d821fc7c3d 100644
--- a/types/react-color/lib/components/swatches/Swatches.d.ts
+++ b/types/react-color/lib/components/swatches/Swatches.d.ts
@@ -7,4 +7,4 @@ export interface SwatchesPickerProps extends ColorPickerProps<SwatchesPicker> {
     width?: number;
 }
 
-export default class SwatchesPicker extends Component<SwatchesPickerProps, any> {}
+export default class SwatchesPicker extends Component<SwatchesPickerProps> {}
diff --git a/types/react-color/lib/components/twitter/Twitter.d.ts b/types/react-color/lib/components/twitter/Twitter.d.ts
index b4e6bb2308..84b53dbc7a 100644
--- a/types/react-color/lib/components/twitter/Twitter.d.ts
+++ b/types/react-color/lib/components/twitter/Twitter.d.ts
@@ -3,4 +3,4 @@ import { ColorPickerProps } from "react-color";
 
 export type TwitterPickerProps = ColorPickerProps<TwitterPicker>;
 
-export default class TwitterPicker extends Component<TwitterPickerProps, any> {}
+export default class TwitterPicker extends Component<TwitterPickerProps> {}
diff --git a/types/react-copy-to-clipboard/index.d.ts b/types/react-copy-to-clipboard/index.d.ts
index 9fb6425c06..f8cab84517 100644
--- a/types/react-copy-to-clipboard/index.d.ts
+++ b/types/react-copy-to-clipboard/index.d.ts
@@ -23,5 +23,5 @@ declare namespace CopyToClipboard {
   }
 }
 
-declare class CopyToClipboard extends React.Component<CopyToClipboard.Props, {}> {
+declare class CopyToClipboard extends React.Component<CopyToClipboard.Props> {
 }
diff --git a/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx b/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
index 4d412f0257..89f8de67d2 100644
--- a/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
+++ b/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as CopyToClipboard from "react-copy-to-clipboard";
 
-export class Test extends React.Component<any, any> {
+export class Test extends React.Component<any> {
     render() {
         return (
           <CopyToClipboard text={"Hello World"}
diff --git a/types/react-cropper/index.d.ts b/types/react-cropper/index.d.ts
index d0dc88d8c1..43f2cac063 100644
--- a/types/react-cropper/index.d.ts
+++ b/types/react-cropper/index.d.ts
@@ -16,7 +16,7 @@ import CroppedCanvasOptions = cropperjs.CroppedCanvasOptions;
 type ReactCropperProps = cropperjs.CropperOptions & React.HTMLProps<HTMLImageElement>;
 
 interface ReactCropper extends cropperjs {} // tslint:disable-line no-empty-interface
-declare class ReactCropper extends React.Component<ReactCropperProps, {}> {
+declare class ReactCropper extends React.Component<ReactCropperProps> {
     on(eventname: string, callback: () => void): void;
 }
 export default ReactCropper;
diff --git a/types/react-cropper/react-cropper-tests.tsx b/types/react-cropper/react-cropper-tests.tsx
index aa46343b36..1fad04cc50 100644
--- a/types/react-cropper/react-cropper-tests.tsx
+++ b/types/react-cropper/react-cropper-tests.tsx
@@ -3,7 +3,7 @@ import Cropper from 'react-cropper';
 // If you choose not to use import, you need to assign Cropper to default
 // var Cropper = require('react-cropper').default
 
-class Demo extends React.Component<{}, {}> {
+class Demo extends React.Component<{}> {
     crop() {
         // image in dataUrl
         console.log((this.refs['cropper'] as any).getCroppedCanvas().toDataURL());
diff --git a/types/react-css-modules/react-css-modules-tests.tsx b/types/react-css-modules/react-css-modules-tests.tsx
index 18f4cd04e3..da191799c7 100644
--- a/types/react-css-modules/react-css-modules-tests.tsx
+++ b/types/react-css-modules/react-css-modules-tests.tsx
@@ -7,7 +7,7 @@ interface TableProps extends CSSModules.InjectedCSSModuleProps {
 
 }
 
-class Table extends React.Component<TableProps, {}> {
+class Table extends React.Component<TableProps> {
     render () {
         const { styles } = this.props;
 
@@ -29,7 +29,7 @@ interface TableDecoratedProps extends CSSModules.InjectedCSSModuleProps {
 }
 
 @CSSModules(styles)
-class TableDecorated extends React.Component<TableDecoratedProps, {}> {
+class TableDecorated extends React.Component<TableDecoratedProps> {
     render () {
         const { styles } = this.props;
 
@@ -47,7 +47,7 @@ interface TableProps extends CSSModules.InjectedCSSModuleProps {
 
 }
 
-class Svg extends React.Component<TableProps, {}> {
+class Svg extends React.Component<TableProps> {
     render () {
         const { styles } = this.props;
 
diff --git a/types/react-custom-scrollbars/index.d.ts b/types/react-custom-scrollbars/index.d.ts
index 3c1363fc84..4af4d37d06 100644
--- a/types/react-custom-scrollbars/index.d.ts
+++ b/types/react-custom-scrollbars/index.d.ts
@@ -47,7 +47,7 @@ declare module "react-custom-scrollbars" {
         autoHeightMax?: number;
     }
 
-    export default class Scrollbars extends React.Component<ScrollbarProps, {}> {
+    export default class Scrollbars extends React.Component<ScrollbarProps> {
         scrollTop(top: number): void;
         scrollLeft(left: number): void;
         scrollToTop(): void;
diff --git a/types/react-custom-scrollbars/v3/index.d.ts b/types/react-custom-scrollbars/v3/index.d.ts
index 83b414c514..6c408ec6f8 100644
--- a/types/react-custom-scrollbars/v3/index.d.ts
+++ b/types/react-custom-scrollbars/v3/index.d.ts
@@ -40,7 +40,7 @@ declare module "react-custom-scrollbars" {
         universal?: boolean;
     }
 
-    export default class Scrollbars extends React.Component<ScrollbarProps, {}> {
+    export default class Scrollbars extends React.Component<ScrollbarProps> {
         scrollTop(top: number): void;
         scrollLeft(left: number): void;
         scrollToTop(): void;
diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index b5355a1af1..5e4f23f5f5 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -425,7 +425,7 @@ declare namespace AdazzleReactDataGrid {
      * Excel-like grid component built with React, with editors, keyboard navigation, copy & paste, and the like
      * http://adazzle.github.io/react-data-grid/
      */
-    export class ReactDataGrid extends React.Component<GridProps, {}> { }
+    export class ReactDataGrid extends React.Component<GridProps> { }
     export namespace ReactDataGrid {
         // Useful types
         export import Column = AdazzleReactDataGrid.Column;
@@ -443,29 +443,29 @@ declare namespace AdazzleReactDataGrid {
         /**
          * A react component that renders a row of the grid
          */
-        export class Row extends React.Component<any, any> { }
+        export class Row extends React.Component<any> { }
         /**
          * A react coponent that renders a cell of the grid
          */
-        export class Cell extends React.Component<any, any> { }
+        export class Cell extends React.Component<any> { }
     }
 }
 
 declare namespace AdazzleReactDataGridPlugins {
     // TODO: refine types for these addons
     export namespace Editors {
-        export class AutoComplete extends React.Component<any, {}> { }
-        export class DropDownEditor extends React.Component<any, {}> { }
-        export class SimpleTextEditor extends React.Component<any, {}> { }
-        export class CheckboxEditor extends React.Component<any, {}> { }
+        export class AutoComplete extends React.Component<any> { }
+        export class DropDownEditor extends React.Component<any> { }
+        export class SimpleTextEditor extends React.Component<any> { }
+        export class CheckboxEditor extends React.Component<any> { }
     }
     export namespace Formatters {
-        export class ImageFormatter extends React.Component<any, {}> { }
-        export class DropDownFormatter extends React.Component<any, {}> { }
+        export class ImageFormatter extends React.Component<any> { }
+        export class DropDownFormatter extends React.Component<any> { }
     }
-    export class Toolbar extends React.Component<any, any> {}
+    export class Toolbar extends React.Component<any> {}
     export namespace DraggableHeader {
-        export class DraggableContainer extends React.Component<any, any>{ }
+        export class DraggableContainer extends React.Component<any>{ }
     }
     export namespace Data {
         export const Selectors: {
@@ -476,10 +476,10 @@ declare namespace AdazzleReactDataGridPlugins {
     // TODO: re-export the react-contextmenu typings once those exist
     // https://github.com/vkbansal/react-contextmenu/issues/10
     export namespace Menu {
-        export class ContextMenu extends React.Component<any, {}> { }
-        export class MenuHeader extends React.Component<any, {}> { }
-        export class MenuItem extends React.Component<any, {}> { }
-        export class SubMenu extends React.Component<any, {}> { }
+        export class ContextMenu extends React.Component<any> { }
+        export class MenuHeader extends React.Component<any> { }
+        export class MenuItem extends React.Component<any> { }
+        export class SubMenu extends React.Component<any> { }
         export const monitor: {
             getItem(): any
             getPosition(): any
diff --git a/types/react-data-grid/v1/index.d.ts b/types/react-data-grid/v1/index.d.ts
index ce5cf5e606..20ffef6c2b 100644
--- a/types/react-data-grid/v1/index.d.ts
+++ b/types/react-data-grid/v1/index.d.ts
@@ -406,7 +406,7 @@ declare namespace AdazzleReactDataGrid {
      * Excel-like grid component built with React, with editors, keyboard navigation, copy & paste, and the like
      * http://adazzle.github.io/react-data-grid/
      */
-    export class ReactDataGrid extends React.Component<GridProps, {}> { }
+    export class ReactDataGrid extends React.Component<GridProps> { }
     export namespace ReactDataGrid {
         // Useful types
         export import Column = AdazzleReactDataGrid.Column;
@@ -424,34 +424,34 @@ declare namespace AdazzleReactDataGrid {
         /**
          * A react component that renders a row of the grid
          */
-        export class Row extends React.Component<any, any> { }
+        export class Row extends React.Component<any> { }
         /**
          * A react coponent that renders a cell of the grid
          */
-        export class Cell extends React.Component<any, any> { }
+        export class Cell extends React.Component<any> { }
     }
 }
 
 declare namespace AdazzleReactDataGridPlugins {
     // TODO: refine types for these addons
     export namespace Editors {
-        export class AutoComplete extends React.Component<any, {}> { }
-        export class DropDownEditor extends React.Component<any, {}> { }
-        export class SimpleTextEditor extends React.Component<any, {}> { }
-        export class CheckboxEditor extends React.Component<any, {}> { }
+        export class AutoComplete extends React.Component<any> { }
+        export class DropDownEditor extends React.Component<any> { }
+        export class SimpleTextEditor extends React.Component<any> { }
+        export class CheckboxEditor extends React.Component<any> { }
     }
     export namespace Formatters {
-        export class ImageFormatter extends React.Component<any, {}> { }
-        export class DropDownFormatter extends React.Component<any, {}> { }
+        export class ImageFormatter extends React.Component<any> { }
+        export class DropDownFormatter extends React.Component<any> { }
     }
-    export class Toolbar extends React.Component<any, any> {}
+    export class Toolbar extends React.Component<any> {}
     // TODO: re-export the react-contextmenu typings once those exist
     // https://github.com/vkbansal/react-contextmenu/issues/10
     export namespace Menu {
-        export class ContextMenu extends React.Component<any, {}> { }
-        export class MenuHeader extends React.Component<any, {}> { }
-        export class MenuItem extends React.Component<any, {}> { }
-        export class SubMenu extends React.Component<any, {}> { }
+        export class ContextMenu extends React.Component<any> { }
+        export class MenuHeader extends React.Component<any> { }
+        export class MenuItem extends React.Component<any> { }
+        export class SubMenu extends React.Component<any> { }
         export const monitor: {
             getItem(): any
             getPosition(): any
diff --git a/types/react-datagrid/index.d.ts b/types/react-datagrid/index.d.ts
index 6817f3866d..e3c8d983ea 100644
--- a/types/react-datagrid/index.d.ts
+++ b/types/react-datagrid/index.d.ts
@@ -303,6 +303,6 @@ declare namespace ReactDataGrid {
 				}
     }
 
-    export class DataGrid extends React.Component<DataGridProps, {}> {
+    export class DataGrid extends React.Component<DataGridProps> {
     }
 }
diff --git a/types/react-datagrid/react-datagrid-tests.tsx b/types/react-datagrid/react-datagrid-tests.tsx
index bdbca39f01..9e0f6714a2 100644
--- a/types/react-datagrid/react-datagrid-tests.tsx
+++ b/types/react-datagrid/react-datagrid-tests.tsx
@@ -14,7 +14,7 @@ var selected = {};
 var sortInfo = [ { name: 'country', dir: 'asc'}]
 
 export module X {
-export class ExampleBasic extends React.Component<{},{}> {
+export class ExampleBasic extends React.Component<{}> {
   render(): React.ReactElement<any> {
       return (
           <ReactDataGrid
@@ -28,7 +28,7 @@ export class ExampleBasic extends React.Component<{},{}> {
 }
 }
 
-class ExampleFull extends React.Component<{},{}> {
+class ExampleFull extends React.Component<{}> {
 
     render(): React.ReactElement<any> {
 		    return (
diff --git a/types/react-daterange-picker/index.d.ts b/types/react-daterange-picker/index.d.ts
index 3c3707e2fa..ce7f653d75 100644
--- a/types/react-daterange-picker/index.d.ts
+++ b/types/react-daterange-picker/index.d.ts
@@ -7,7 +7,7 @@
 import * as React from "react";
 import * as moment from "moment-range";
 
-export default class DateRangePicker extends React.Component<Props, {}> {}
+export default class DateRangePicker extends React.Component<Props> {}
 export as namespace ReactDateRangePicker;
 
 interface Props extends React.Props<{}> {
@@ -61,6 +61,6 @@ interface PaginationArrowProps extends React.Props<{}> {
     direction?: 'next' | 'previous';
 }
 
-declare class PaginationArrow extends React.Component<PaginationArrowProps, {}> {
+declare class PaginationArrow extends React.Component<PaginationArrowProps> {
 }
 
diff --git a/types/react-daterange-picker/react-daterange-picker-tests.tsx b/types/react-daterange-picker/react-daterange-picker-tests.tsx
index 1bb372d4db..2892bc8f44 100644
--- a/types/react-daterange-picker/react-daterange-picker-tests.tsx
+++ b/types/react-daterange-picker/react-daterange-picker-tests.tsx
@@ -66,7 +66,7 @@ class DateSinglePicker extends React.Component<AppProps, any> {
     }
 }
 
-export class Main extends React.Component<any, any> {
+export class Main extends React.Component<any> {
 
     render() {
         const stateDefinitions: ReactDateRangePicker.StateDefinitions = {
diff --git a/types/react-dates/react-dates-tests.tsx b/types/react-dates/react-dates-tests.tsx
index 387b53bdba..27f1faf85d 100644
--- a/types/react-dates/react-dates-tests.tsx
+++ b/types/react-dates/react-dates-tests.tsx
@@ -16,7 +16,7 @@ import {
 
 
 
-class SingleDatePickerMinimumTest extends React.Component<{}, {}> {
+class SingleDatePickerMinimumTest extends React.Component<{}> {
     render() {
         return <SingleDatePicker
                     id="SingleDatePickerInput"
@@ -28,7 +28,7 @@ class SingleDatePickerMinimumTest extends React.Component<{}, {}> {
     }
 }
 
-class SingleDatePickerFullTest extends React.Component<{}, {}> {
+class SingleDatePickerFullTest extends React.Component<{}> {
     render() {
         return <SingleDatePicker
                     id="SingleDatePickerInput"
@@ -64,7 +64,7 @@ class SingleDatePickerFullTest extends React.Component<{}, {}> {
     }
 }
 
-class DateRangePickerMinimumTest extends React.Component<{}, {}> {
+class DateRangePickerMinimumTest extends React.Component<{}> {
     render() {
         return <DateRangePicker
                     startDate={moment()}
@@ -77,7 +77,7 @@ class DateRangePickerMinimumTest extends React.Component<{}, {}> {
 }
 
 
-class DateRangePickerFullTest extends React.Component<{}, {}> {
+class DateRangePickerFullTest extends React.Component<{}> {
     render() {
         return <DateRangePicker
                     disabled={false}
@@ -116,7 +116,7 @@ class DateRangePickerFullTest extends React.Component<{}, {}> {
     }
 }
 
-class DayPickerRangeControllerMinimumTest extends React.Component<{}, {}> {
+class DayPickerRangeControllerMinimumTest extends React.Component<{}> {
     render() {
         return <DayPickerRangeController
                     startDate={moment()}
diff --git a/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts b/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
index 4ca6adfa32..47fa6ab5d4 100644
--- a/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
+++ b/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
@@ -75,7 +75,7 @@ namespace Knight {
         };
     }
 
-    export class Knight extends React.Component<KnightP, {}> {
+    export class Knight extends React.Component<KnightP> {
         static defaultProps: KnightP;
 
         static create = React.createFactory(Knight);
@@ -111,7 +111,7 @@ namespace Square {
         black: boolean;
     }
 
-    export class Square extends React.Component<SquareP, {}> {
+    export class Square extends React.Component<SquareP> {
         render() {
             const fill = this.props.black ? 'black' : 'white';
             return r.div({
@@ -150,7 +150,7 @@ namespace BoardSquare {
         };
     }
 
-    export class BoardSquare extends React.Component<BoardSquareP, {}> {
+    export class BoardSquare extends React.Component<BoardSquareP> {
         static defaultProps: BoardSquareP;
 
         private _renderOverlay = (color: string) => {
@@ -210,7 +210,7 @@ namespace CustomDragLayer {
         };
     }
 
-    export class CustomDragLayer extends React.Component<CustomDragLayerP, {}> {
+    export class CustomDragLayer extends React.Component<CustomDragLayerP> {
         render() {
             return r.div(null, this.props.isDragging ? this.props.item : null);
         }
@@ -229,7 +229,7 @@ namespace Board {
         knightPosition: number[];
     }
 
-    export class Board extends React.Component<BoardP, {}> {
+    export class Board extends React.Component<BoardP> {
         private _renderPiece = (x: number, y: number) => {
             const knightX = this.props.knightPosition[0];
             const knightY = this.props.knightPosition[1];
diff --git a/types/react-dnd/index.d.ts b/types/react-dnd/index.d.ts
index 2b6ca1fd4b..13402d440f 100644
--- a/types/react-dnd/index.d.ts
+++ b/types/react-dnd/index.d.ts
@@ -80,8 +80,8 @@ declare module __ReactDnd {
     // ----------------------------------------------------------------------
 
     interface DragSourceSpec<P> {
-        beginDrag(props: P, monitor?: DragSourceMonitor, component?: React.Component<P, any>): Object;
-        endDrag?(props: P, monitor?: DragSourceMonitor, component?: React.Component<P, any>): void;
+        beginDrag(props: P, monitor?: DragSourceMonitor, component?: React.Component<P>): Object;
+        endDrag?(props: P, monitor?: DragSourceMonitor, component?: React.Component<P>): void;
         canDrag?(props: P, monitor?: DragSourceMonitor): boolean;
         isDragging?(props: P, monitor?: DragSourceMonitor): boolean;
     }
@@ -126,8 +126,8 @@ declare module __ReactDnd {
     // ----------------------------------------------------------------------
 
     interface DropTargetSpec<P> {
-        drop?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P, any>): Object|void;
-        hover?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P, any>): void;
+        drop?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P>): Object|void;
+        hover?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P>): void;
         canDrop?(props: P, monitor?: DropTargetMonitor): boolean;
     }
 
diff --git a/types/react-dnd/react-dnd-tests.ts b/types/react-dnd/react-dnd-tests.ts
index 7ba80e36c2..127f4c9904 100644
--- a/types/react-dnd/react-dnd-tests.ts
+++ b/types/react-dnd/react-dnd-tests.ts
@@ -87,7 +87,7 @@ namespace Knight {
         };
     }
 
-    export class Knight extends React.Component<KnightP, {}> {
+    export class Knight extends React.Component<KnightP> {
         static defaultProps: KnightP;
 
         static create = React.createFactory(Knight);
@@ -123,7 +123,7 @@ namespace Square {
         black: boolean;
     }
 
-    export class Square extends React.Component<SquareP, {}> {
+    export class Square extends React.Component<SquareP> {
         render() {
             var fill = this.props.black ? 'black' : 'white';
             return r.div({
@@ -162,7 +162,7 @@ namespace BoardSquare {
         };
     }
 
-    export class BoardSquare extends React.Component<BoardSquareP, {}> {
+    export class BoardSquare extends React.Component<BoardSquareP> {
         static defaultProps: BoardSquareP;
 
         private _renderOverlay = (color: string) => {
@@ -225,7 +225,7 @@ namespace CustomDragLayer {
         };
     }
 
-    export class CustomDragLayer extends React.Component<CustomDragLayerP, {}> {
+    export class CustomDragLayer extends React.Component<CustomDragLayerP> {
         render() {
             return r.div(null, this.props.isDragging ? this.props.item : null);
         }
@@ -244,7 +244,7 @@ namespace Board {
         knightPosition: number[];
     }
 
-    export class Board extends React.Component<BoardP, {}> {
+    export class Board extends React.Component<BoardP> {
         private _renderPiece = (x: number, y: number) => {
             var knightX = this.props.knightPosition[0];
             var knightY = this.props.knightPosition[1];
diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index d2280c1c65..796314e19f 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -39,7 +39,7 @@ export function render<P>(
     callback?: (component?: Component<P, ComponentState> | Element) => any
 ): Component<P, ComponentState> | Element | void;
 export function render<P>(
-    parentComponent: Component<any, any>,
+    parentComponent: Component<any>,
     element: SFCElement<P>,
     container: Element,
     callback?: () => any
@@ -54,17 +54,17 @@ export function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
 export function unstable_batchedUpdates(callback: () => any): void;
 
 export function unstable_renderSubtreeIntoContainer<P extends DOMAttributes<T>, T extends Element>(
-    parentComponent: Component<any, any>,
+    parentComponent: Component<any>,
     element: DOMElement<P, T>,
     container: Element,
     callback?: (element: T) => any): T;
 export function unstable_renderSubtreeIntoContainer<P, T extends Component<P, ComponentState>>(
-    parentComponent: Component<any, any>,
+    parentComponent: Component<any>,
     element: CElement<P, T>,
     container: Element,
     callback?: (component: T) => any): T;
 export function unstable_renderSubtreeIntoContainer<P>(
-    parentComponent: Component<any, any>,
+    parentComponent: Component<any>,
     element: ReactElement<P>,
     container: Element,
     callback?: (component?: Component<P, ComponentState> | Element) => any): Component<P, ComponentState> | Element | void;
diff --git a/types/react-dom/react-dom-tests.ts b/types/react-dom/react-dom-tests.ts
index c38f307a4e..b50f78d3e5 100644
--- a/types/react-dom/react-dom-tests.ts
+++ b/types/react-dom/react-dom-tests.ts
@@ -6,7 +6,7 @@ import * as ReactTestUtils from 'react-dom/test-utils';
 declare function describe(desc: string, f: () => void): void;
 declare function it(desc: string, f: () => void): void;
 
-class TestComponent extends React.Component<{}, {}> { }
+class TestComponent extends React.Component<{}> { }
 
 describe('ReactDOM', () => {
     it('render', () => {
diff --git a/types/react-dom/test-utils/index.d.ts b/types/react-dom/test-utils/index.d.ts
index 3153b3dba7..b45dd56759 100644
--- a/types/react-dom/test-utils/index.d.ts
+++ b/types/react-dom/test-utils/index.d.ts
@@ -56,7 +56,7 @@ export interface SyntheticEventData extends OptionalEventProperties {
     which?: number;
 }
 
-export type EventSimulator = (element: Element | Component<any, any>, eventData?: SyntheticEventData) => void;
+export type EventSimulator = (element: Element | Component<any>, eventData?: SyntheticEventData) => void;
 
 export interface MockedComponentClass {
     new (): any;
@@ -126,10 +126,10 @@ export function renderIntoDocument<T extends Element>(
     element: DOMElement<any, T>): T;
 export function renderIntoDocument(
     element: SFCElement<any>): void;
-export function renderIntoDocument<T extends Component<any, any>>(
+export function renderIntoDocument<T extends Component<any>>(
     element: CElement<any, T>): T;
 export function renderIntoDocument<P>(
-    element: ReactElement<P>): Component<P, {}> | Element | void;
+    element: ReactElement<P>): Component<P> | Element | void;
 
 /**
  * Pass a mocked component module to this method to augment it with useful methods that allow it to
@@ -162,7 +162,7 @@ export function isElementOfType<P>(
 /**
  * Returns `true` if `element` is a React element whose type is of a React `componentClass`.
  */
-export function isElementOfType<P, T extends Component<P, {}>, C extends ComponentClass<P>>(
+export function isElementOfType<P, T extends Component<P>, C extends ComponentClass<P>>(
     element: ReactElement<any>, type: ClassType<P, T, C>): element is CElement<P, T>;
 
 /**
@@ -172,11 +172,11 @@ export function isDOMComponent(instance: ReactInstance): instance is Element;
 /**
  * Returns `true` if `instance` is a user-defined component, such as a class or a function.
  */
-export function isCompositeComponent(instance: ReactInstance): instance is Component<any, any>;
+export function isCompositeComponent(instance: ReactInstance): instance is Component<any>;
 /**
  * Returns `true` if `instance` is a component whose type is of a React `componentClass`.
  */
-export function isCompositeComponentWithType<T extends Component<any, any>, C extends ComponentClass<any>>(
+export function isCompositeComponentWithType<T extends Component<any>, C extends ComponentClass<any>>(
     instance: ReactInstance, type: ClassType<any, T, C>): boolean;
 
 /**
@@ -185,7 +185,7 @@ export function isCompositeComponentWithType<T extends Component<any, any>, C ex
  * as a primitive for other test utils.
  */
 export function findAllInRenderedTree(
-    root: Component<any, any>,
+    root: Component<any>,
     fn: (i: ReactInstance) => boolean): ReactInstance[];
 
 /**
@@ -193,7 +193,7 @@ export function findAllInRenderedTree(
  * DOM components with the class name matching `className`.
  */
 export function scryRenderedDOMComponentsWithClass(
-    root: Component<any, any>,
+    root: Component<any>,
     className: string): Element[];
 /**
  * Like `scryRenderedDOMComponentsWithClass()` but expects there to be one result,
@@ -201,7 +201,7 @@ export function scryRenderedDOMComponentsWithClass(
  * number of matches besides one.
  */
 export function findRenderedDOMComponentWithClass(
-    root: Component<any, any>,
+    root: Component<any>,
     className: string): Element;
 
 /**
@@ -209,7 +209,7 @@ export function findRenderedDOMComponentWithClass(
  * DOM components with the tag name matching `tagName`.
  */
 export function scryRenderedDOMComponentsWithTag(
-    root: Component<any, any>,
+    root: Component<any>,
     tagName: string): Element[];
 /**
  * Like `scryRenderedDOMComponentsWithTag()` but expects there to be one result,
@@ -217,14 +217,14 @@ export function scryRenderedDOMComponentsWithTag(
  * number of matches besides one.
  */
 export function findRenderedDOMComponentWithTag(
-    root: Component<any, any>,
+    root: Component<any>,
     tagName: string): Element;
 
 /**
  * Finds all instances of components with type equal to `componentClass`.
  */
-export function scryRenderedComponentsWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-    root: Component<any, any>,
+export function scryRenderedComponentsWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+    root: Component<any>,
     type: ClassType<any, T, C>): T[];
 
 /**
@@ -232,8 +232,8 @@ export function scryRenderedComponentsWithType<T extends Component<{}, {}>, C ex
  * and returns that one result, or throws exception if there is any other
  * number of matches besides one.
  */
-export function findRenderedComponentWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-    root: Component<any, any>,
+export function findRenderedComponentWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+    root: Component<any>,
     type: ClassType<any, T, C>): T;
 
 /**
diff --git a/types/react-dropzone/react-dropzone-tests.tsx b/types/react-dropzone/react-dropzone-tests.tsx
index ec6d5fa763..4f0046a290 100644
--- a/types/react-dropzone/react-dropzone-tests.tsx
+++ b/types/react-dropzone/react-dropzone-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as Dropzone from 'react-dropzone';
 
-class Test extends React.Component<any, any> {
+class Test extends React.Component<any> {
   constructor(props: any) {
     super(props);
   }
diff --git a/types/react-easy-chart/index.d.ts b/types/react-easy-chart/index.d.ts
index a91045d85e..9c254c6a28 100644
--- a/types/react-easy-chart/index.d.ts
+++ b/types/react-easy-chart/index.d.ts
@@ -80,7 +80,7 @@ declare module "react-easy-chart" {
 		/** The amount of ticks to be shown on the y axis */
 		yTickNumber?: number;
 	}
-	class BarChart extends React.Component<BarChartProps, {}> {
+	class BarChart extends React.Component<BarChartProps> {
 	}
 
 	interface PieData {
@@ -113,7 +113,7 @@ declare module "react-easy-chart" {
 
 		styles?: { [cssSelector: string]: React.CSSProperties };
 	}
-	class PieChart extends React.Component<PieChartProps, {}> {
+	class PieChart extends React.Component<PieChartProps> {
 	}
 
 	interface LineData {
@@ -184,14 +184,14 @@ declare module "react-easy-chart" {
 		/** What data type the x axis is */
 		yType?: 'time' | 'text' | 'linear';
 	}
-	class LineChart extends React.Component<LineChartProps, {}> {
+	class LineChart extends React.Component<LineChartProps> {
 	}
 
 	interface AreaChartProps extends LineChartProps {
 		/** Make the gradient area a solid fill rather than a gradient */
 		noAreaGradient?: boolean;
 	}
-	class AreaChart extends React.Component<AreaChartProps, {}> {
+	class AreaChart extends React.Component<AreaChartProps> {
 	}
 
 	interface ScatterplotData {
@@ -253,7 +253,7 @@ declare module "react-easy-chart" {
 		/** What data type the x axis is */
 		yType?: 'time' | 'text' | 'linear';
 	}
-	class ScatterplotChart extends React.Component<ScatterplotChartProps, {}> {
+	class ScatterplotChart extends React.Component<ScatterplotChartProps> {
 	}
 
 	interface LegendProps {
@@ -270,7 +270,7 @@ declare module "react-easy-chart" {
 		/** Override the css styles of individual components, see http://rma-consulting.github.io/react-easy-chart/legend/index.html */
 		styles?: { [cssSelector: string]: React.CSSProperties };
 	}
-	class Legend extends React.Component<LegendProps, {}> {
+	class Legend extends React.Component<LegendProps> {
 
 	}
 
diff --git a/types/react-easy-chart/react-easy-chart-tests.tsx b/types/react-easy-chart/react-easy-chart-tests.tsx
index 65ab377ccc..eac50bf6c7 100644
--- a/types/react-easy-chart/react-easy-chart-tests.tsx
+++ b/types/react-easy-chart/react-easy-chart-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AreaChart, BarChart, Legend, LineChart, PieChart, ScatterplotChart } from 'react-easy-chart';
 
-class BarChartData extends React.Component<{}, {}> {
+class BarChartData extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -19,7 +19,7 @@ class BarChartData extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartHeightAndWidth extends React.Component<{}, {}> {
+class BarChartHeightAndWidth extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -40,7 +40,7 @@ class BarChartHeightAndWidth extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartColorBars extends React.Component<{}, {}> {
+class BarChartColorBars extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -62,7 +62,7 @@ class BarChartColorBars extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartMargin extends React.Component<{}, {}> {
+class BarChartMargin extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -76,7 +76,7 @@ class BarChartMargin extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartOverridingBarColors extends React.Component<{}, {}> {
+class BarChartOverridingBarColors extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -94,7 +94,7 @@ class BarChartOverridingBarColors extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartAxes extends React.Component<{}, {}> {
+class BarChartAxes extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -116,7 +116,7 @@ class BarChartAxes extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartAxesLabels extends React.Component<{}, {}> {
+class BarChartAxesLabels extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -137,7 +137,7 @@ class BarChartAxesLabels extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartYAxisOrientation extends React.Component<{}, {}> {
+class BarChartYAxisOrientation extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -161,7 +161,7 @@ class BarChartYAxisOrientation extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartYAxesType extends React.Component<{}, {}> {
+class BarChartYAxesType extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -181,7 +181,7 @@ class BarChartYAxesType extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartYAxesType2 extends React.Component<{}, {}> {
+class BarChartYAxesType2 extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -201,7 +201,7 @@ class BarChartYAxesType2 extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartDatePattern extends React.Component<{}, {}> {
+class BarChartDatePattern extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -222,7 +222,7 @@ class BarChartDatePattern extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartBarWidth extends React.Component<{}, {}> {
+class BarChartBarWidth extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -244,7 +244,7 @@ class BarChartBarWidth extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartDomainRange extends React.Component<{}, {}> {
+class BarChartDomainRange extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -267,7 +267,7 @@ class BarChartDomainRange extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartTickDisplayFormat extends React.Component<{}, {}> {
+class BarChartTickDisplayFormat extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -290,7 +290,7 @@ class BarChartTickDisplayFormat extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartNumberOfTicks extends React.Component<{}, {}> {
+class BarChartNumberOfTicks extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -314,7 +314,7 @@ class BarChartNumberOfTicks extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartGrid extends React.Component<{}, {}> {
+class BarChartGrid extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -339,7 +339,7 @@ class BarChartGrid extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartBarAndLine extends React.Component<{}, {}> {
+class BarChartBarAndLine extends React.Component<{}> {
 	render(): any {
 		return (
 			<BarChart
@@ -376,7 +376,7 @@ class BarChartBarAndLine extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartMouseHandlers extends React.Component<{}, {}> {
+class BarChartMouseHandlers extends React.Component<{}> {
 	mouseOverHandler(d: any, e: any) {
 	}
 
@@ -416,7 +416,7 @@ class BarChartMouseHandlers extends React.Component<{}, {}> {
 }
 
 
-class PieChartData extends React.Component<{}, {}> {
+class PieChartData extends React.Component<{}> {
 	render(): any {
 		return (
 			<PieChart
@@ -430,7 +430,7 @@ class PieChartData extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartColor extends React.Component<{}, {}> {
+class PieChartColor extends React.Component<{}> {
 	render(): any {
 		return (
 
@@ -445,7 +445,7 @@ class PieChartColor extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartSize extends React.Component<{}, {}> {
+class PieChartSize extends React.Component<{}> {
 	render(): any {
 		return (
 			<PieChart
@@ -460,7 +460,7 @@ class PieChartSize extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartDonut extends React.Component<{}, {}> {
+class PieChartDonut extends React.Component<{}> {
 	render(): any {
 		return (
 			<PieChart
@@ -476,7 +476,7 @@ class PieChartDonut extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartPadding extends React.Component<{}, {}> {
+class PieChartPadding extends React.Component<{}> {
 	render(): any {
 		return (
 			<PieChart
@@ -491,7 +491,7 @@ class PieChartPadding extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartLabels extends React.Component<{}, {}> {
+class PieChartLabels extends React.Component<{}> {
 	render(): any {
 		return (
 			<PieChart
@@ -512,7 +512,7 @@ class PieChartLabels extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartStyle extends React.Component<{}, {}> {
+class PieChartStyle extends React.Component<{}> {
 	render(): any {
 		return (
 			<PieChart
@@ -537,7 +537,7 @@ class PieChartStyle extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartMouseHandlers extends React.Component<{}, {}> {
+class PieChartMouseHandlers extends React.Component<{}> {
 	mouseOverHandler(d: any, e: any) { }
 	mouseMoveHandler(e: any) { }
 	mouseOutHandler() { }
@@ -561,7 +561,7 @@ class PieChartMouseHandlers extends React.Component<{}, {}> {
 }
 
 
-class LineChartData extends React.Component<{}, {}> {
+class LineChartData extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -577,7 +577,7 @@ class LineChartData extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartData2 extends React.Component<{}, {}> {
+class LineChartData2 extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -597,7 +597,7 @@ class LineChartData2 extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartHeightAndWidth extends React.Component<{}, {}> {
+class LineChartHeightAndWidth extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -619,7 +619,7 @@ class LineChartHeightAndWidth extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartMargin extends React.Component<{}, {}> {
+class LineChartMargin extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -642,7 +642,7 @@ class LineChartMargin extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartAxes extends React.Component<{}, {}> {
+class LineChartAxes extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -665,7 +665,7 @@ class LineChartAxes extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartAxesLabels extends React.Component<{}, {}> {
+class LineChartAxesLabels extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -690,7 +690,7 @@ class LineChartAxesLabels extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartYAxisOrientation extends React.Component<{}, {}> {
+class LineChartYAxisOrientation extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -715,7 +715,7 @@ class LineChartYAxisOrientation extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartInterpolate extends React.Component<{}, {}> {
+class LineChartInterpolate extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -741,7 +741,7 @@ class LineChartInterpolate extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartXType extends React.Component<{}, {}> {
+class LineChartXType extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -770,7 +770,7 @@ class LineChartXType extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartXTypeTime extends React.Component<{}, {}> {
+class LineChartXTypeTime extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -799,7 +799,7 @@ class LineChartXTypeTime extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartYTypeText extends React.Component<{}, {}> {
+class LineChartYTypeText extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -825,7 +825,7 @@ class LineChartYTypeText extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartYTypeTime extends React.Component<{}, {}> {
+class LineChartYTypeTime extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -853,7 +853,7 @@ class LineChartYTypeTime extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartGrid extends React.Component<{}, {}> {
+class LineChartGrid extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -882,7 +882,7 @@ class LineChartGrid extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartVerticalGrid extends React.Component<{}, {}> {
+class LineChartVerticalGrid extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -913,7 +913,7 @@ class LineChartVerticalGrid extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartDomainRange extends React.Component<{}, {}> {
+class LineChartDomainRange extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -946,7 +946,7 @@ class LineChartDomainRange extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartTickDisplayFormat extends React.Component<{}, {}> {
+class LineChartTickDisplayFormat extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -976,7 +976,7 @@ class LineChartTickDisplayFormat extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartNumberOfTicks extends React.Component<{}, {}> {
+class LineChartNumberOfTicks extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -1010,7 +1010,7 @@ class LineChartNumberOfTicks extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartLineColors extends React.Component<{}, {}> {
+class LineChartLineColors extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -1042,7 +1042,7 @@ class LineChartLineColors extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartDataPoints extends React.Component<{}, {}> {
+class LineChartDataPoints extends React.Component<{}> {
 	render(): any {
 		return (
 			<LineChart
@@ -1075,7 +1075,7 @@ class LineChartDataPoints extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartMouseEvents extends React.Component<{}, {}> {
+class LineChartMouseEvents extends React.Component<{}> {
 	mouseOverHandler(d: any, e: any) { }
 	mouseMoveHandler(e: any) { }
 	mouseOutHandler() { }
@@ -1117,7 +1117,7 @@ class LineChartMouseEvents extends React.Component<{}, {}> {
 }
 
 
-class AreaChartData extends React.Component<{}, {}> {
+class AreaChartData extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1133,7 +1133,7 @@ class AreaChartData extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartData2 extends React.Component<{}, {}> {
+class AreaChartData2 extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1153,7 +1153,7 @@ class AreaChartData2 extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartHeightAndWidth extends React.Component<{}, {}> {
+class AreaChartHeightAndWidth extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1175,7 +1175,7 @@ class AreaChartHeightAndWidth extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartMargin extends React.Component<{}, {}> {
+class AreaChartMargin extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1198,7 +1198,7 @@ class AreaChartMargin extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartAxes extends React.Component<{}, {}> {
+class AreaChartAxes extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1221,7 +1221,7 @@ class AreaChartAxes extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartAxesLabels extends React.Component<{}, {}> {
+class AreaChartAxesLabels extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1246,7 +1246,7 @@ class AreaChartAxesLabels extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartYAxisOrientation extends React.Component<{}, {}> {
+class AreaChartYAxisOrientation extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1271,7 +1271,7 @@ class AreaChartYAxisOrientation extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartInterpolate extends React.Component<{}, {}> {
+class AreaChartInterpolate extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1297,7 +1297,7 @@ class AreaChartInterpolate extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartAxisType extends React.Component<{}, {}> {
+class AreaChartAxisType extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1326,7 +1326,7 @@ class AreaChartAxisType extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartAxisTypeXTime extends React.Component<{}, {}> {
+class AreaChartAxisTypeXTime extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1355,7 +1355,7 @@ class AreaChartAxisTypeXTime extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartYTypeText extends React.Component<{}, {}> {
+class AreaChartYTypeText extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1381,7 +1381,7 @@ class AreaChartYTypeText extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartGrid extends React.Component<{}, {}> {
+class AreaChartGrid extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1411,7 +1411,7 @@ class AreaChartGrid extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartVerticalGrid extends React.Component<{}, {}> {
+class AreaChartVerticalGrid extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1442,7 +1442,7 @@ class AreaChartVerticalGrid extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartDomainRange extends React.Component<{}, {}> {
+class AreaChartDomainRange extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1475,7 +1475,7 @@ class AreaChartDomainRange extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartTickDisplayFormat extends React.Component<{}, {}> {
+class AreaChartTickDisplayFormat extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1506,7 +1506,7 @@ class AreaChartTickDisplayFormat extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartTickNumbers extends React.Component<{}, {}> {
+class AreaChartTickNumbers extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1539,7 +1539,7 @@ class AreaChartTickNumbers extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartDataPoints extends React.Component<{}, {}> {
+class AreaChartDataPoints extends React.Component<{}> {
 	render(): any {
 		return (
 			<AreaChart
@@ -1573,7 +1573,7 @@ class AreaChartDataPoints extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartMouseHandlers extends React.Component<{}, {}> {
+class AreaChartMouseHandlers extends React.Component<{}> {
 	mouseOverHandler(d: any, e: any) { }
 	mouseMoveHandler(e: any) { }
 	mouseOutHandler() { }
@@ -1668,7 +1668,7 @@ const data = [
 	}
 ];
 
-class ScatterplotData extends React.Component<{}, {}> {
+class ScatterplotData extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart data={data} />
@@ -1676,7 +1676,7 @@ class ScatterplotData extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotHeightAndWidth extends React.Component<{}, {}> {
+class ScatterplotHeightAndWidth extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart data={data} width={160} height={90} />
@@ -1684,7 +1684,7 @@ class ScatterplotHeightAndWidth extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotMargin extends React.Component<{}, {}> {
+class ScatterplotMargin extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1694,7 +1694,7 @@ class ScatterplotMargin extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotAxes extends React.Component<{}, {}> {
+class ScatterplotAxes extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1706,7 +1706,7 @@ class ScatterplotAxes extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotYAxisOrientation extends React.Component<{}, {}> {
+class ScatterplotYAxisOrientation extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1721,7 +1721,7 @@ class ScatterplotYAxisOrientation extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotAxesLabels extends React.Component<{}, {}> {
+class ScatterplotAxesLabels extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1735,7 +1735,7 @@ class ScatterplotAxesLabels extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotDotRadius extends React.Component<{}, {}> {
+class ScatterplotDotRadius extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1750,7 +1750,7 @@ class ScatterplotDotRadius extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotConfig extends React.Component<{}, {}> {
+class ScatterplotConfig extends React.Component<{}> {
 	config = [
 		{
 			type: 'One',
@@ -1775,7 +1775,7 @@ class ScatterplotConfig extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotGrid extends React.Component<{}, {}> {
+class ScatterplotGrid extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1791,7 +1791,7 @@ class ScatterplotGrid extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotVerticalGrid extends React.Component<{}, {}> {
+class ScatterplotVerticalGrid extends React.Component<{}> {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1808,7 +1808,7 @@ class ScatterplotVerticalGrid extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotAxisType extends React.Component<{}, {}> {
+class ScatterplotAxisType extends React.Component<{}> {
 
 	typedData = [
 		{
@@ -1849,7 +1849,7 @@ class ScatterplotAxisType extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotDomainRange extends React.Component<{}, {}> {
+class ScatterplotDomainRange extends React.Component<{}> {
 
 	typedData = [
 		{
@@ -1896,7 +1896,7 @@ class ScatterplotDomainRange extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotMouseEvents extends React.Component<{}, {}> {
+class ScatterplotMouseEvents extends React.Component<{}> {
 	mouseOverHandler(d: any, e: any) { }
 	mouseMoveHandler(e: any) { }
 	mouseOutHandler() { }
@@ -1927,7 +1927,7 @@ const pieData = [
 	{ key: 'Other', value: 50 }
 ];
 
-class LegendData extends React.Component<{}, {}> {
+class LegendData extends React.Component<{}> {
 	render(): any {
 		return (
 			<Legend data={pieData} dataId={'key'} />
@@ -1935,7 +1935,7 @@ class LegendData extends React.Component<{}, {}> {
 	}
 }
 
-class LegendHorizontal extends React.Component<{}, {}> {
+class LegendHorizontal extends React.Component<{}> {
 	render(): any {
 		return (
 			<Legend data={pieData} dataId={'key'} horizontal />
@@ -1955,7 +1955,7 @@ const config = [
 	{ color: '#e3a51a' }
 ];
 
-class LegendConfig extends React.Component<{}, {}> {
+class LegendConfig extends React.Component<{}> {
 	render(): any {
 		return (
 			<Legend data={pieDataCustom} dataId={'key'} config={config} />
@@ -2006,7 +2006,7 @@ const customStyle = {
 	}
 };
 
-class LegendStyles extends React.Component<{}, {}> {
+class LegendStyles extends React.Component<{}> {
 	render(): any {
 		return (
 			<Legend
diff --git a/types/react-event-listener/index.d.ts b/types/react-event-listener/index.d.ts
index 62ec0f2249..abfee41683 100644
--- a/types/react-event-listener/index.d.ts
+++ b/types/react-event-listener/index.d.ts
@@ -224,4 +224,4 @@ export interface EventListenerProps {
     target: Window | Document | string;
 }
 
-export default class EventListener extends React.Component<EventListenerProps, {}> { }
+export default class EventListener extends React.Component<EventListenerProps> { }
diff --git a/types/react-fa/index.d.ts b/types/react-fa/index.d.ts
index 357c3921f6..54a2581cd0 100644
--- a/types/react-fa/index.d.ts
+++ b/types/react-fa/index.d.ts
@@ -32,7 +32,7 @@ export interface IconProps extends SizeOverrideHTMLProps<Icon> {
     Component?: CustomComponent;
 }
 
-export type Icon = Component<IconProps, any>;
+export type Icon = Component<IconProps>;
 export const Icon: ComponentClass<IconProps>;
 
 export interface IconStackProps extends SizeOverrideHTMLProps<IconStack> {
@@ -48,7 +48,7 @@ export interface IconStackProps extends SizeOverrideHTMLProps<IconStack> {
     // children?: IconProps[];
 }
 
-export type IconStack = Component<IconStackProps, any>;
+export type IconStack = Component<IconStackProps>;
 export const IconStack: ComponentClass<IconStackProps>;
 
 export default Icon;
diff --git a/types/react-fa/react-fa-tests.tsx b/types/react-fa/react-fa-tests.tsx
index 66158099e6..13e98dbc5e 100644
--- a/types/react-fa/react-fa-tests.tsx
+++ b/types/react-fa/react-fa-tests.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Icon, IconStack, IconProps } from 'react-fa';
 import DefaultIcon from 'react-fa';
 
-export class ReactFATest extends React.Component<any, any> {
+export class ReactFATest extends React.Component<any> {
     render() {
         const defaultProps = {
             name: 'flask',
diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 1a302e2777..d8fd4a0c8b 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -30,7 +30,7 @@ interface ReactFacebookLoginProps {
     version?: string;
     xfbml?: boolean;
     isMobile?: boolean;
-    tag?: Node | React.Component<any, any>;
+    tag?: Node | React.Component<any>;
 }
 
 export interface ReactFacebookLoginInfo {
diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx
index 0efd5aa548..0fb71dd02b 100644
--- a/types/react-facebook-login/react-facebook-login-tests.tsx
+++ b/types/react-facebook-login/react-facebook-login-tests.tsx
@@ -58,7 +58,7 @@ ReactDOM.render(
     document.getElementById('demo')
 );
 
-class MyComponent extends React.Component<any, any> {
+class MyComponent extends React.Component<any> {
     private responseFacebook(response: ReactFacebookLoginInfo) {
         console.log(response);
     }
@@ -76,7 +76,7 @@ class MyComponent extends React.Component<any, any> {
     }
 }
 
-class MyComponent2 extends React.Component<any, any> {
+class MyComponent2 extends React.Component<any> {
     private responseFacebook(response: ReactFacebookLoginInfo) {
         console.log(response);
     }
diff --git a/types/react-faux-dom/react-faux-dom-tests.tsx b/types/react-faux-dom/react-faux-dom-tests.tsx
index 5541da849d..4a618d6967 100644
--- a/types/react-faux-dom/react-faux-dom-tests.tsx
+++ b/types/react-faux-dom/react-faux-dom-tests.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as d3 from 'd3';
 import { createElement, Element } from 'react-faux-dom';
 
-class SomeChart extends React.Component<any, any> {
+class SomeChart extends React.Component<any> {
   render() {
     const el = createElement('div');
 
diff --git a/types/react-file-input/index.d.ts b/types/react-file-input/index.d.ts
index d697ca38c6..48c9854e55 100644
--- a/types/react-file-input/index.d.ts
+++ b/types/react-file-input/index.d.ts
@@ -16,7 +16,7 @@ declare module "react-file-input" {
         onChange: (event: React.SyntheticEvent<any>) => void;
     }
 
-    class FileInput extends React.Component<FileInputProps, {}> {
+    class FileInput extends React.Component<FileInputProps> {
     }
 
     export = FileInput;
diff --git a/types/react-file-input/react-file-input-tests.tsx b/types/react-file-input/react-file-input-tests.tsx
index 857a86d4e2..b6955c34c0 100644
--- a/types/react-file-input/react-file-input-tests.tsx
+++ b/types/react-file-input/react-file-input-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import FileInput = require('react-file-input');
 
-class Form extends React.Component<{}, {}> {
+class Form extends React.Component<{}> {
     handleChange = (event: React.SyntheticEvent<any>) => {
         const target: any = event.target;
         console.log('Selected file:', target.files[0]);
diff --git a/types/react-file-reader-input/index.d.ts b/types/react-file-reader-input/index.d.ts
index eedffdc78f..af87636234 100644
--- a/types/react-file-reader-input/index.d.ts
+++ b/types/react-file-reader-input/index.d.ts
@@ -6,7 +6,7 @@
 
 import * as React from 'react';
 
-declare class FileInput extends React.Component<FileInput.Props, {}> {
+declare class FileInput extends React.Component<FileInput.Props> {
 }
 
 declare namespace FileInput {
diff --git a/types/react-file-reader-input/react-file-reader-input-tests.tsx b/types/react-file-reader-input/react-file-reader-input-tests.tsx
index 1ee4f2f699..42d3cb50d9 100644
--- a/types/react-file-reader-input/react-file-reader-input-tests.tsx
+++ b/types/react-file-reader-input/react-file-reader-input-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as FileReaderInput from 'react-file-reader-input';
 
-class MyComponent extends React.Component<{}, {}> {
+class MyComponent extends React.Component<{}> {
   handleChange = (event: React.SyntheticEvent<any>, results: FileReaderInput.Result[]) => {
     results.forEach(result => {
       const [event, file] = result;
diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 5b806e83d6..68b2d793f8 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -14,4 +14,4 @@ export interface DateTimePickerProps {
     value?: string;
 }
 
-export default class DatePicker extends Component<DateTimePickerProps, void> {}
+export default class DatePicker extends Component<DateTimePickerProps> {}
diff --git a/types/react-flex/index.d.ts b/types/react-flex/index.d.ts
index 823a0e513a..446445b2ba 100644
--- a/types/react-flex/index.d.ts
+++ b/types/react-flex/index.d.ts
@@ -67,7 +67,7 @@ export interface CommonFlexProps {
 export interface FlexProps extends React.Props<Flex>, CommonFlexProps {
 }
 
-export class Flex extends React.Component<FlexProps, {}> {
+export class Flex extends React.Component<FlexProps> {
 }
 
 export interface ItemProps extends React.Props<Flex>, CommonFlexProps {
@@ -88,6 +88,6 @@ export interface ItemProps extends React.Props<Flex>, CommonFlexProps {
     flexBasis?: number | "none" | "auto" | "content" | "fit-content" | "min-content" | "max-content" | "fit";
 }
 
-export class Item extends React.Component<ItemProps, {}> {
+export class Item extends React.Component<ItemProps> {
 }
 
diff --git a/types/react-flexr/index.d.ts b/types/react-flexr/index.d.ts
index e0d4031fc9..4b610711f6 100644
--- a/types/react-flexr/index.d.ts
+++ b/types/react-flexr/index.d.ts
@@ -31,7 +31,7 @@ declare namespace __ReactFlexr {
         flexCells?: boolean;
     }
 
-    export class Grid extends React.Component<GridProps, {}> {
+    export class Grid extends React.Component<GridProps> {
     }
 
     interface CellProps extends React.Props<Cell> {
@@ -80,7 +80,7 @@ declare namespace __ReactFlexr {
         desk?: string | number;
     }
 
-    export class Cell extends React.Component<CellProps, {}> {
+    export class Cell extends React.Component<CellProps> {
     }
 
     /**
diff --git a/types/react-flexr/react-flexr-tests.tsx b/types/react-flexr/react-flexr-tests.tsx
index 224ceb686c..e3ed567d9a 100644
--- a/types/react-flexr/react-flexr-tests.tsx
+++ b/types/react-flexr/react-flexr-tests.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
 import * as ReactDOMServer from "react-dom/server";
 import { Grid, Cell, findMatch, setBreakpoints, findBreakpoints, getCurrentBreakpoints, optimizedResize, palm, lap, portable, desk } from "react-flexr";
 
-class Example extends React.Component<any, any> {
+class Example extends React.Component<any> {
     render() {
         return (
             <Grid>
@@ -16,7 +16,7 @@ class Example extends React.Component<any, any> {
     }
 }
 
-class Example2 extends React.Component<any, any> {
+class Example2 extends React.Component<any> {
     render() {
         return (
             <Grid>
@@ -52,7 +52,7 @@ class Example2 extends React.Component<any, any> {
     }
 }
 
-class App1 extends React.Component<any, any> {
+class App1 extends React.Component<any> {
     render() {
         const isPalm = findMatch("palm");
 
@@ -89,7 +89,7 @@ function textFxn(req: any, res: any): void {
 
 const breakpoints: string[] | boolean = findBreakpoints();
 
-class App2 extends React.Component<any, any> {
+class App2 extends React.Component<any> {
     componentDidMount() {
         optimizedResize.init( () => {
             if ( findBreakpoints() ) {
diff --git a/types/react-flip-move/index.d.ts b/types/react-flip-move/index.d.ts
index f0ba3c6d7c..8480d50c28 100644
--- a/types/react-flip-move/index.d.ts
+++ b/types/react-flip-move/index.d.ts
@@ -9,7 +9,7 @@ import { Component, ReactElement } from "react";
 export as namespace FlipMove;
 export = FlipMove;
 
-declare class FlipMove extends Component<FlipMove.FlipMoveProps, any> { }
+declare class FlipMove extends Component<FlipMove.FlipMoveProps> { }
 
 declare namespace FlipMove {
     type AnimationPreset = "elevator" | "fade" | "accordionVertical" | "accordionHorizontal" | "none";
diff --git a/types/react-flip-move/react-flip-move-tests.tsx b/types/react-flip-move/react-flip-move-tests.tsx
index c17c4f7bcc..13d4bb8281 100644
--- a/types/react-flip-move/react-flip-move-tests.tsx
+++ b/types/react-flip-move/react-flip-move-tests.tsx
@@ -1,13 +1,13 @@
 import * as React from "react";
 import * as FlipMove from "react-flip-move";
 
-class DefaultTest extends React.Component<any, any> {
+class DefaultTest extends React.Component<any> {
     render() {
         return <FlipMove />;
     }
 }
 
-class PresetTest extends React.Component<any, any> {
+class PresetTest extends React.Component<any> {
     render() {
         return (
             <FlipMove
@@ -19,7 +19,7 @@ class PresetTest extends React.Component<any, any> {
     }
 }
 
-class CustomAnimationTest extends React.Component<any, any> {
+class CustomAnimationTest extends React.Component<any> {
     render() {
         const enterAnimation: FlipMove.Animation = {
             from: { opacity: "0" },
@@ -41,7 +41,7 @@ class CustomAnimationTest extends React.Component<any, any> {
     }
 }
 
-class FlipMoveTest extends React.Component<any, any> {
+class FlipMoveTest extends React.Component<any> {
     onStart = (childElement: React.ReactElement<any>, domNode: HTMLElement) => {};
 
     onFinish = (childElement: React.ReactElement<any>, domNode: HTMLElement) => {};
diff --git a/types/react-fontawesome/index.d.ts b/types/react-fontawesome/index.d.ts
index 21901b63ed..bc1fa7b3b6 100644
--- a/types/react-fontawesome/index.d.ts
+++ b/types/react-fontawesome/index.d.ts
@@ -29,7 +29,7 @@ declare module "react-fontawesome" {
     tag?: string
   }
 
-  class FontAwesome extends React.Component<FontAwesomeProps, {}> {}
+  class FontAwesome extends React.Component<FontAwesomeProps> {}
 
   export = FontAwesome;
 }
diff --git a/types/react-fontawesome/react-fontawesome-tests.tsx b/types/react-fontawesome/react-fontawesome-tests.tsx
index 32aad1ddb7..d1e38abdfc 100644
--- a/types/react-fontawesome/react-fontawesome-tests.tsx
+++ b/types/react-fontawesome/react-fontawesome-tests.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import FontAwesome = require('react-fontawesome');
 
-class TestComponent extends React.Component<{}, {}> {
+class TestComponent extends React.Component<{}> {
 
   render() {
 
diff --git a/types/react-gravatar/index.d.ts b/types/react-gravatar/index.d.ts
index 8a4d54525f..d7941f9224 100644
--- a/types/react-gravatar/index.d.ts
+++ b/types/react-gravatar/index.d.ts
@@ -13,7 +13,7 @@ export = Gravatar;
 /**
  * React component for rendering a gravatar profile image. Adjusts automatically to HiDPI displays.
  */
-declare class Gravatar extends React.Component<Gravatar.Props, void> {
+declare class Gravatar extends React.Component<Gravatar.Props> {
 	static readonly displayName: string;
 
 	static readonly defaultProps: Gravatar.Props;
diff --git a/types/react-gravatar/react-gravatar-tests.tsx b/types/react-gravatar/react-gravatar-tests.tsx
index 1dee72f2c9..a33e28b587 100644
--- a/types/react-gravatar/react-gravatar-tests.tsx
+++ b/types/react-gravatar/react-gravatar-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Gravatar from "react-gravatar";
 
-class GravatarEmailTest extends React.Component<void, void> {
+class GravatarEmailTest extends React.Component<void> {
 	render() {
 		return (
 			<Gravatar
@@ -17,7 +17,7 @@ class GravatarEmailTest extends React.Component<void, void> {
 	}
 }
 
-class GravatarHashTest extends React.Component<void, void> {
+class GravatarHashTest extends React.Component<void> {
 	render() {
 		return (
 			<Gravatar
@@ -33,7 +33,7 @@ class GravatarHashTest extends React.Component<void, void> {
 	}
 }
 
-class GravatarMinimalTest extends React.Component<void, void> {
+class GravatarMinimalTest extends React.Component<void> {
 	render() {
 		return <Gravatar email="test@example.com" />;
 	}
diff --git a/types/react-grid-layout/index.d.ts b/types/react-grid-layout/index.d.ts
index 766b14b0d9..63a6d0e6d7 100644
--- a/types/react-grid-layout/index.d.ts
+++ b/types/react-grid-layout/index.d.ts
@@ -9,7 +9,7 @@ import * as React from "react";
 export as namespace ReactGridLayout;
 export = ReactGridLayout;
 
-declare class ReactGridLayout extends React.Component<ReactGridLayout.ReactGridLayoutProps, any> { }
+declare class ReactGridLayout extends React.Component<ReactGridLayout.ReactGridLayoutProps> { }
 
 declare namespace ReactGridLayout {
     type Breakpoints = 'lg' | 'md' | 'sm' | 'xs' | 'xxs';
@@ -275,7 +275,7 @@ declare namespace ReactGridLayout {
         ): void;
     }
 
-    class Responsive extends React.Component<ResponsiveProps, any> { }
+    class Responsive extends React.Component<ResponsiveProps> { }
 
     interface WidthProviderProps {
         /**
diff --git a/types/react-grid-layout/react-grid-layout-tests.tsx b/types/react-grid-layout/react-grid-layout-tests.tsx
index 081da57e9c..65b12fa639 100644
--- a/types/react-grid-layout/react-grid-layout-tests.tsx
+++ b/types/react-grid-layout/react-grid-layout-tests.tsx
@@ -4,7 +4,7 @@ import { Responsive, WidthProvider } from 'react-grid-layout';
 
 const ResponsiveWidth = WidthProvider(Responsive);
 
-class DefaultGridTest extends React.Component<any, any> {
+class DefaultGridTest extends React.Component<any> {
   render() {
     const layout = [
       { i: 'a', x: 0, y: 0, w: 1, h: 2, static: true },
@@ -29,7 +29,7 @@ class DefaultGridTest extends React.Component<any, any> {
   }
 }
 
-class ResponsiveGridTest extends React.Component<any, any> {
+class ResponsiveGridTest extends React.Component<any> {
   render() {
     return (
       <Responsive
@@ -45,7 +45,7 @@ class ResponsiveGridTest extends React.Component<any, any> {
   }
 }
 
-class ResponsiveGridWidthProviderTest extends React.Component<any, any> {
+class ResponsiveGridWidthProviderTest extends React.Component<any> {
   render() {
     return (
       <ResponsiveWidth
diff --git a/types/react-hamburger-menu/index.d.ts b/types/react-hamburger-menu/index.d.ts
index 8eba3fe8c3..1f91e6e8f0 100644
--- a/types/react-hamburger-menu/index.d.ts
+++ b/types/react-hamburger-menu/index.d.ts
@@ -8,7 +8,7 @@ import * as React from "react";
 
 export default HamburgerMenu;
 
-declare class HamburgerMenu extends React.PureComponent<HamburgerMenuProps, {}> {
+declare class HamburgerMenu extends React.PureComponent<HamburgerMenuProps> {
 }
 
 export interface HamburgerMenuProps {
diff --git a/types/react-helmet/index.d.ts b/types/react-helmet/index.d.ts
index dd91253a10..359836bea8 100644
--- a/types/react-helmet/index.d.ts
+++ b/types/react-helmet/index.d.ts
@@ -23,7 +23,7 @@ interface HelmetProps {
     titleTemplate?: string;
 }
 
-export class Helmet extends React.Component<HelmetProps, any> {
+export class Helmet extends React.Component<HelmetProps> {
     static peek(): HelmetData;
     static rewind(): HelmetData;
     static renderStatic(): HelmetData;
@@ -45,7 +45,7 @@ export interface HelmetData {
 
 export interface HelmetDatum {
     toString(): string;
-    toComponent(): React.Component<any, any>;
+    toComponent(): React.Component<any>;
 }
 
 export interface HelmetHTMLBodyDatum {
diff --git a/types/react-helmet/v4/index.d.ts b/types/react-helmet/v4/index.d.ts
index db85c123e4..ab5ea373df 100644
--- a/types/react-helmet/v4/index.d.ts
+++ b/types/react-helmet/v4/index.d.ts
@@ -39,10 +39,10 @@ declare namespace ReactHelmet {
 
     interface HelmetDatum {
         toString(): string;
-        toComponent(): React.Component<any, any>;
+        toComponent(): React.Component<any>;
     }
 
-    class HelmetComponent extends React.Component<HelmetProps, any> {}
+    class HelmetComponent extends React.Component<HelmetProps> {}
 }
 
 export = ReactHelmet;
diff --git a/types/react-highlight-words/index.d.ts b/types/react-highlight-words/index.d.ts
index adbf95a64d..3f37a70aaf 100644
--- a/types/react-highlight-words/index.d.ts
+++ b/types/react-highlight-words/index.d.ts
@@ -29,6 +29,6 @@ interface HighlighterProps {
     textToHighlight: string;
 }
 
-declare class Highlighter extends React.Component<HighlighterProps, any> {
+declare class Highlighter extends React.Component<HighlighterProps> {
     static propTypes: any;
 }
diff --git a/types/react-highlighter/react-highlighter-tests.tsx b/types/react-highlighter/react-highlighter-tests.tsx
index 79760228dd..9eb3181cbf 100644
--- a/types/react-highlighter/react-highlighter-tests.tsx
+++ b/types/react-highlighter/react-highlighter-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as Highlight from 'react-highlighter';
 
-export class ReactHolderTest extends React.Component<any, any> {
+export class ReactHolderTest extends React.Component<any> {
     render() {
         return (
             <div>
diff --git a/types/react-holder/index.d.ts b/types/react-holder/index.d.ts
index ac9686a564..a82731f8ba 100644
--- a/types/react-holder/index.d.ts
+++ b/types/react-holder/index.d.ts
@@ -26,7 +26,7 @@ interface ReactHolderProp extends React.HTMLAttributes<ReactHolder> {
     lineWrap?: number;
 }
 
-declare class ReactHolder extends React.Component<ReactHolderProp, any> {
+declare class ReactHolder extends React.Component<ReactHolderProp> {
 
 }
 export default ReactHolder;
diff --git a/types/react-holder/react-holder-tests.tsx b/types/react-holder/react-holder-tests.tsx
index 93b009eaa5..cc742a2453 100644
--- a/types/react-holder/react-holder-tests.tsx
+++ b/types/react-holder/react-holder-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import Holder from "react-holder";
 
-export class ReactHolderTest extends React.Component<any, any> {
+export class ReactHolderTest extends React.Component<any> {
     public render() {
         return (
             <div>
diff --git a/types/react-hot-loader/index.d.ts b/types/react-hot-loader/index.d.ts
index afc9052158..214bd23f73 100644
--- a/types/react-hot-loader/index.d.ts
+++ b/types/react-hot-loader/index.d.ts
@@ -15,4 +15,4 @@ export interface AppContainerProps {
   errorReporter?: React.ComponentClass<ErrorReporterProps> | React.StatelessComponent<ErrorReporterProps>
 }
 
-export class AppContainer extends React.Component<AppContainerProps, {}> {}
+export class AppContainer extends React.Component<AppContainerProps> {}
diff --git a/types/react-hot-loader/react-hot-loader-tests.tsx b/types/react-hot-loader/react-hot-loader-tests.tsx
index 08866fcbb9..e5079c82ab 100644
--- a/types/react-hot-loader/react-hot-loader-tests.tsx
+++ b/types/react-hot-loader/react-hot-loader-tests.tsx
@@ -5,7 +5,7 @@ interface ErrorReporterProps {
   error: any
 }
 
-class ErrorReporterComponent extends React.Component<ErrorReporterProps, any> {
+class ErrorReporterComponent extends React.Component<ErrorReporterProps> {
   public render() {
     return <p>{this.props.error.message}</p>
   }
@@ -14,7 +14,7 @@ class ErrorReporterComponent extends React.Component<ErrorReporterProps, any> {
 const DummyComponent = () => <p>Dummy component</p>
 const ErrorReporter = ({ error } : ErrorReporterProps) => <ErrorReporterComponent error={error} />
 
-class AppContainerTest extends React.Component<any, any> {
+class AppContainerTest extends React.Component<any> {
   public render() {
     return (
       <div>
diff --git a/types/react-i18next/index.d.ts b/types/react-i18next/index.d.ts
index c1c583b390..cf56874445 100644
--- a/types/react-i18next/index.d.ts
+++ b/types/react-i18next/index.d.ts
@@ -24,7 +24,7 @@ interface I18nextProviderProps {
     children?: React.ReactElement<any>;
 }
 
-export class I18nextProvider extends React.Component<I18nextProviderProps, {}> { }
+export class I18nextProvider extends React.Component<I18nextProviderProps> { }
 
 
 type InterpolateValue = string | JSX.Element;
@@ -42,7 +42,7 @@ interface InterpolateProps {
     [regexKey: string]: InterpolateValue | RegExp | I18next.TranslationOptions | boolean | undefined;
 }
 
-export class Interpolate extends React.Component<InterpolateProps, {}> { }
+export class Interpolate extends React.Component<InterpolateProps> { }
 
 interface TranslateOptions {
     withRef?: boolean;
diff --git a/types/react-i18next/react-i18next-tests.tsx b/types/react-i18next/react-i18next-tests.tsx
index fa2e36fcb1..0939b632a5 100644
--- a/types/react-i18next/react-i18next-tests.tsx
+++ b/types/react-i18next/react-i18next-tests.tsx
@@ -24,7 +24,7 @@ interface InnerAnotherComponentProps {
     _?: TranslationFunction;
 }
 
-class InnerAnotherComponent extends React.Component<InnerAnotherComponentProps, {}> {
+class InnerAnotherComponent extends React.Component<InnerAnotherComponentProps> {
     render() {
         const _ = this.props._!;
 
@@ -39,7 +39,7 @@ const AnotherComponent = translate('view', { wait: true, translateFuncName: '_'
 interface InnerYetAnotherComponentProps extends InjectedTranslateProps {
 }
 
-class InnerYetAnotherComponent extends React.Component<InnerYetAnotherComponentProps, {}> {
+class InnerYetAnotherComponent extends React.Component<InnerYetAnotherComponentProps> {
     render() {
         const t = this.props.t!;
 
@@ -53,7 +53,7 @@ interface TranslatableViewProps extends InjectedTranslateProps {
 }
 
 @translate(['view', 'nav'], { wait: true })
-class TranslatableView extends React.Component<TranslatableViewProps, {}> {
+class TranslatableView extends React.Component<TranslatableViewProps> {
     render() {
         const t = this.props.t!;
 
@@ -84,7 +84,7 @@ class TranslatableView extends React.Component<TranslatableViewProps, {}> {
     }
 }
 
-class App extends React.Component<{}, {}> {
+class App extends React.Component<{}> {
     render() {
         return (
             <div className='main'>
diff --git a/types/react-imageloader/index.d.ts b/types/react-imageloader/index.d.ts
index cc5de6f1d8..4038e90ae0 100644
--- a/types/react-imageloader/index.d.ts
+++ b/types/react-imageloader/index.d.ts
@@ -33,7 +33,7 @@ declare module "react-imageloader" {
       wrapper?: (props: any) => React.ReactElement<any>;
   }
 
-  class ImageLoader extends React.Component<ImageLoaderProps, {}> {}
+  class ImageLoader extends React.Component<ImageLoaderProps> {}
 
   export = ImageLoader;
 }
diff --git a/types/react-infinite-scroller/index.d.ts b/types/react-infinite-scroller/index.d.ts
index 25e23c0cc5..b833c48981 100644
--- a/types/react-infinite-scroller/index.d.ts
+++ b/types/react-infinite-scroller/index.d.ts
@@ -61,5 +61,5 @@ declare module 'react-infinite-scroller' {
         loader?: React.ReactElement<any>;
     }
 
-    export default class InfiniteScroll extends React.Component<InfiniteScrollProps, any> { }
+    export default class InfiniteScroll extends React.Component<InfiniteScrollProps> { }
 }
diff --git a/types/react-infinite-scroller/react-infinite-scroller-tests.tsx b/types/react-infinite-scroller/react-infinite-scroller-tests.tsx
index e98f1dc7f8..d07a38e212 100644
--- a/types/react-infinite-scroller/react-infinite-scroller-tests.tsx
+++ b/types/react-infinite-scroller/react-infinite-scroller-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import InfiniteScroll from 'react-infinite-scroller';
 
-class Test1 extends React.Component<{}, {}> {
+class Test1 extends React.Component<{}> {
     public render() {
         return (
             <InfiniteScroll
@@ -13,7 +13,7 @@ class Test1 extends React.Component<{}, {}> {
     }
 }
 
-class Test2 extends React.Component<{}, {}> {
+class Test2 extends React.Component<{}> {
     public render() {
         return (
             <InfiniteScroll
diff --git a/types/react-infinite/index.d.ts b/types/react-infinite/index.d.ts
index 05b1e13aae..28d3ead9b7 100644
--- a/types/react-infinite/index.d.ts
+++ b/types/react-infinite/index.d.ts
@@ -29,7 +29,7 @@ declare namespace ReactInfinite {
 		displayBottomUpwards?: boolean;
 	}
 
-	export class Infinite extends React.Component<InfiniteProps, {}> {
+	export class Infinite extends React.Component<InfiniteProps> {
 		static containerHeightScaleFactor(n: number): any;
 	}
 }
diff --git a/types/react-infinite/react-infinite-tests.tsx b/types/react-infinite/react-infinite-tests.tsx
index ea68999afc..f9cd8e0621 100644
--- a/types/react-infinite/react-infinite-tests.tsx
+++ b/types/react-infinite/react-infinite-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Infinite = require('react-infinite');
 
-class Test1 extends React.Component<{}, {}> {
+class Test1 extends React.Component<{}> {
     render() {
         return (
             <Infinite containerHeight={200} elementHeight={40}>
@@ -13,7 +13,7 @@ class Test1 extends React.Component<{}, {}> {
     }
 }
 
-class Test2 extends React.Component<{}, {}> {
+class Test2 extends React.Component<{}> {
     render() {
         return (
             <Infinite containerHeight={200} elementHeight={[111, 252, 143]}>
@@ -25,7 +25,7 @@ class Test2 extends React.Component<{}, {}> {
     }
 }
 
-class Test3 extends React.Component<{}, {}> {
+class Test3 extends React.Component<{}> {
     render() {
         return (
             <Infinite containerHeight={200} elementHeight={[111, 252, 143]}
@@ -38,7 +38,7 @@ class Test3 extends React.Component<{}, {}> {
     }
 }
 
-class Test4 extends React.Component<{}, {}> {
+class Test4 extends React.Component<{}> {
     render() {
         return (
             <Infinite containerHeight={200} elementHeight={[111, 252, 143]}
diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index cfa18f2184..74963b8cc3 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -37,7 +37,7 @@ declare namespace reactInputMask {
          */
         alwaysShowMask?: boolean;
     }
-    class ReactInputMask extends React.Component<ReactInputMaskProps, {}> {
+    class ReactInputMask extends React.Component<ReactInputMaskProps> {
     }
 }
 declare var ReactInputMask: typeof reactInputMask.ReactInputMask;
diff --git a/types/react-intl/react-intl-tests.tsx b/types/react-intl/react-intl-tests.tsx
index 1550aafcbe..9984819f41 100644
--- a/types/react-intl/react-intl-tests.tsx
+++ b/types/react-intl/react-intl-tests.tsx
@@ -62,7 +62,7 @@ const SomeFunctionalComponentWithIntl: React.ComponentClass<SomeComponentProps>
     );
 });
 
-class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlProps, void> {
+class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlProps> {
     static propTypes: React.ValidationMap<any> = {
         intl: intlShape.isRequired
     };
@@ -239,7 +239,7 @@ class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlPro
 
 const SomeComponentWithIntl = injectIntl(SomeComponent);
 
-class TestApp extends React.Component<{}, {}> {
+class TestApp extends React.Component<{}> {
     render(): React.ReactElement<{}> {
         const definedMessages = defineMessages({
             sup: {
diff --git a/types/react-intl/v1/react-intl-tests.tsx b/types/react-intl/v1/react-intl-tests.tsx
index c7834b6583..33abc5890d 100644
--- a/types/react-intl/v1/react-intl-tests.tsx
+++ b/types/react-intl/v1/react-intl-tests.tsx
@@ -31,7 +31,7 @@ namespace I18nDirect {
     export interface Props extends IntlComponent.Props {}
 }
 
-class I18nDirect extends React.Component<I18nDirect.Props, any> {
+class I18nDirect extends React.Component<I18nDirect.Props> {
 
     private _currentLocale: string
     private _messages: {[key: string]: string}
@@ -102,7 +102,7 @@ namespace I18nMixin {
 }
 
 @reactMixin.decorate( IntlMixin )
-class I18nMixin extends React.Component<I18nMixin.Props, any> implements IntlComponent {
+class I18nMixin extends React.Component<I18nMixin.Props> implements IntlComponent {
 
     private _currentLocale: string
 
diff --git a/types/react-json-pretty/react-json-pretty-tests.tsx b/types/react-json-pretty/react-json-pretty-tests.tsx
index 485aaf6e68..035ffe5d59 100644
--- a/types/react-json-pretty/react-json-pretty-tests.tsx
+++ b/types/react-json-pretty/react-json-pretty-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as JSONPretty from "react-json-pretty";
 
-export class Test extends React.Component<any, any> {
+export class Test extends React.Component<any> {
     render() {
         const json = {
             foo: "bar"
diff --git a/types/react-json-tree/index.d.ts b/types/react-json-tree/index.d.ts
index 44c409b7f6..d227c16a1e 100644
--- a/types/react-json-tree/index.d.ts
+++ b/types/react-json-tree/index.d.ts
@@ -25,4 +25,4 @@ export interface JSONTreeProps extends Props<JSONTreeComponent> {
     collectionLimit?: number;
 }
 
-export default class JSONTreeComponent extends Component<JSONTreeProps, {}> { }
+export default class JSONTreeComponent extends Component<JSONTreeProps> { }
diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index 440b303f8a..059c83714a 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -33,5 +33,5 @@ declare module "react-jsonschema-form" {
         status: string;
     }
 
-    export default class Form extends React.Component<FormProps, any> {}
+    export default class Form extends React.Component<FormProps> {}
 }
diff --git a/types/react-lazyload/index.d.ts b/types/react-lazyload/index.d.ts
index 795821cfb2..2766d998b0 100644
--- a/types/react-lazyload/index.d.ts
+++ b/types/react-lazyload/index.d.ts
@@ -19,7 +19,7 @@ export interface LazyLoadProps {
     unmountIfInvisible?: boolean;
 }
 
-export default class LazyLoad extends Component<LazyLoadProps, {}> {
+export default class LazyLoad extends Component<LazyLoadProps> {
     constructor(props: LazyLoad);
 }
 
diff --git a/types/react-leaflet/index.d.ts b/types/react-leaflet/index.d.ts
index db3dc44e7c..84269cf5bf 100644
--- a/types/react-leaflet/index.d.ts
+++ b/types/react-leaflet/index.d.ts
@@ -118,7 +118,7 @@ export type LeafletEvents = MapEvents
 // These type parameters aren't needed for instantiating a component, but they are useful for
 // extending react-leaflet classes.
 
-export class MapComponent<P, E extends Leaflet.Class> extends React.Component<P, {}> {
+export class MapComponent<P, E extends Leaflet.Class> extends React.Component<P> {
     _leafletEvents: LeafletEvents;
     leafletElement: E;
     extractLeafletEvents(props: P): LeafletEvents;
@@ -306,7 +306,7 @@ export class Tooltip<P extends TooltipProps = TooltipProps, E extends Leaflet.To
 }
 
 export type MapControlProps = Leaflet.ControlOptions;
-export class MapControl<P extends MapControlProps = MapControlProps, E extends Leaflet.Control = Leaflet.Control> extends React.Component<P, {}> {
+export class MapControl<P extends MapControlProps = MapControlProps, E extends Leaflet.Control = Leaflet.Control> extends React.Component<P> {
     leafletElement: E;
     createLeafletElement(props: P): E;
     updateLeafletElement(fromProps: P, toProps: P): void;
@@ -334,7 +334,7 @@ export namespace LayersControl {
         addOverlay?(layer: Leaflet.Layer, name: string, checked: boolean): void;
         name: string;
     }
-    class ControlledLayer<P extends BaseControlledLayerProps = BaseControlledLayerProps> extends React.Component<P, {}> {
+    class ControlledLayer<P extends BaseControlledLayerProps = BaseControlledLayerProps> extends React.Component<P> {
         layer?: Leaflet.Layer;
         getChildContext(): { layerContainer: LayerContainer };
         addLayer(): void;
diff --git a/types/react-loadable/react-loadable-tests.tsx b/types/react-loadable/react-loadable-tests.tsx
index 3455a7b23a..630849fbeb 100644
--- a/types/react-loadable/react-loadable-tests.tsx
+++ b/types/react-loadable/react-loadable-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Loadable, { LoadingComponentProps } from 'react-loadable';
 
-class LoadingComponent extends React.Component<LoadingComponentProps, {}> {
+class LoadingComponent extends React.Component<LoadingComponentProps> {
   render() {
     return <div>{this.props.isLoading}</div>;
   }
diff --git a/types/react-loader/index.d.ts b/types/react-loader/index.d.ts
index 688541dd83..8734d1cfd9 100644
--- a/types/react-loader/index.d.ts
+++ b/types/react-loader/index.d.ts
@@ -35,7 +35,7 @@ interface LoaderProps extends LoaderOptions {
 	className?: string;
 }
 
-declare class ReactLoader extends Component<LoaderProps, any>  {
+declare class ReactLoader extends Component<LoaderProps>  {
 }
 
 declare namespace ReactLoader {
diff --git a/types/react-loader/react-loader-tests.tsx b/types/react-loader/react-loader-tests.tsx
index c2632459fb..3a0cf7fe8c 100644
--- a/types/react-loader/react-loader-tests.tsx
+++ b/types/react-loader/react-loader-tests.tsx
@@ -23,7 +23,7 @@ const options = {
     position: 'absolute'
 };
 
-class MyComponent extends React.Component<any, any> {
+class MyComponent extends React.Component<any> {
 	getInitialState() {
 		return { loaded: false };
 	}
diff --git a/types/react-maskedinput/react-maskedinput-tests.tsx b/types/react-maskedinput/react-maskedinput-tests.tsx
index cdc8070415..706fc1ae48 100644
--- a/types/react-maskedinput/react-maskedinput-tests.tsx
+++ b/types/react-maskedinput/react-maskedinput-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as MaskedInput from "react-maskedinput";
 
-class Test extends React.Component<any, any> {
+class Test extends React.Component<any> {
     render() {
         return (
             <MaskedInput mask="111"
diff --git a/types/react-mdl/index.d.ts b/types/react-mdl/index.d.ts
index cb157d6540..ff48de32c2 100644
--- a/types/react-mdl/index.d.ts
+++ b/types/react-mdl/index.d.ts
@@ -11,7 +11,7 @@ export = __ReactMDL;
 declare namespace __ReactMDL {
     type __MDLClassProps = React.ClassAttributes<any>;
     type __MDLOtherProps = React.HTMLProps<any>;
-    class __MDLComponent<P> extends React.Component<P, {}> { }
+    class __MDLComponent<P> extends React.Component<P> { }
     class __MDLBasicComponent extends __MDLComponent<__MDLOtherProps> { }
 
     interface ShadowedComponent {
@@ -616,5 +616,5 @@ declare namespace __ReactMDL {
     }
     class Tooltip extends __MDLComponent<TooltipProps> { }
 
-    class MDLComponent extends React.Component<{ recursive?: boolean }, {}> { }
+    class MDLComponent extends React.Component<{ recursive?: boolean }> { }
 }
diff --git a/types/react-measure/index.d.ts b/types/react-measure/index.d.ts
index 23e2b94332..cbbc928215 100644
--- a/types/react-measure/index.d.ts
+++ b/types/react-measure/index.d.ts
@@ -7,7 +7,7 @@
 declare module "react-measure" {
     import * as React from "react";
 
-    class Measure extends React.Component<Measure.MeasureProps, {}> { }
+    class Measure extends React.Component<Measure.MeasureProps> { }
     namespace Measure {
         type MeasurementType = "width" | "height" | "top" | "right" | "bottom" | "left";
         interface Dimensions {
diff --git a/types/react-measure/react-measure-tests.tsx b/types/react-measure/react-measure-tests.tsx
index da2a551a04..f4d2c6f5c2 100644
--- a/types/react-measure/react-measure-tests.tsx
+++ b/types/react-measure/react-measure-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Measure from "react-measure";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component<{}> {
     render() {
         return (
             <Measure accurate
@@ -19,7 +19,7 @@ class Test extends React.Component<{}, {}> {
     }
 }
 
-class Test2 extends React.Component<{}, {}> {
+class Test2 extends React.Component<{}> {
     render() {
         return (
             <Measure accurate
diff --git a/types/react-mixin/react-mixin-tests.tsx b/types/react-mixin/react-mixin-tests.tsx
index f275869a9e..ab9dc7dff8 100644
--- a/types/react-mixin/react-mixin-tests.tsx
+++ b/types/react-mixin/react-mixin-tests.tsx
@@ -4,7 +4,7 @@ import * as React from 'react';
 var someMixin: React.Mixin<any, any>;
 var someOtherMixin: React.Mixin<any, any>;
 
-class Foo extends React.Component<any, any> {
+class Foo extends React.Component<any> {
     render(): JSX.Element { return <div />; }
 }
 
@@ -18,7 +18,7 @@ var mixin: React.Mixin<any, any> = {
     }
 };
 
-class Foo2 extends React.Component<any, any> {
+class Foo2 extends React.Component<any> {
     static defaultProps = {
         a: 1
     };
@@ -31,7 +31,7 @@ class Foo2 extends React.Component<any, any> {
 reactMixin.onClass(Foo2, mixin);
 
 @reactMixin.decorate(mixin)
-class Foo3 extends React.Component<any, any> {
+class Foo3 extends React.Component<any> {
 }
 
 function autobind(methodNames: string[]): React.Mixin<any, any> {
@@ -46,7 +46,7 @@ function autobind(methodNames: string[]): React.Mixin<any, any> {
 
 @reactMixin.decorate(mixin)
 @reactMixin.decorate(autobind(Object.keys(mixin)))
-class Foo4 extends React.Component<any, any> {
+class Foo4 extends React.Component<any> {
 }
 
 
diff --git a/types/react-modal/index.d.ts b/types/react-modal/index.d.ts
index ffffd9a43e..de4df20b60 100644
--- a/types/react-modal/index.d.ts
+++ b/types/react-modal/index.d.ts
@@ -52,7 +52,7 @@ declare namespace ReactModal {
     }
 }
 
-declare class ReactModal extends React.Component<ReactModal.Props, {}> {
+declare class ReactModal extends React.Component<ReactModal.Props> {
     /* Override base styles for all instances of this component. */
     static defaultStyles: ReactModal.Styles;
     /* Call this to properly hide your application from assistive screenreaders and other assistive technologies while the modal is open. */
diff --git a/types/react-modal/react-modal-tests.tsx b/types/react-modal/react-modal-tests.tsx
index 51cdffba0a..a7ad911a72 100644
--- a/types/react-modal/react-modal-tests.tsx
+++ b/types/react-modal/react-modal-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as ReactModal from 'react-modal';
 
-class ExampleOfUsingReactModal extends React.Component<{}, {}> {
+class ExampleOfUsingReactModal extends React.Component<{}> {
   render() {
     const onAfterOpenFn = () => { };
     const onRequestCloseFn = () => { };
diff --git a/types/react-monaco-editor/index.d.ts b/types/react-monaco-editor/index.d.ts
index 714918cdb5..85bb06a0f2 100644
--- a/types/react-monaco-editor/index.d.ts
+++ b/types/react-monaco-editor/index.d.ts
@@ -73,6 +73,6 @@ export interface ReactMonacoEditorProps {
     context?: object;
 }
 
-export default class ReactMonacoEditor extends React.Component<ReactMonacoEditorProps, void> {
+export default class ReactMonacoEditor extends React.Component<ReactMonacoEditorProps> {
     editor: monaco.editor.ICodeEditor;
 }
diff --git a/types/react-monaco-editor/react-monaco-editor-tests.tsx b/types/react-monaco-editor/react-monaco-editor-tests.tsx
index d8e8642bf9..34d66aff73 100644
--- a/types/react-monaco-editor/react-monaco-editor-tests.tsx
+++ b/types/react-monaco-editor/react-monaco-editor-tests.tsx
@@ -129,7 +129,7 @@ class AnotherEditor extends React.Component<object, CodeEditorState> {
     }
 }
 
-class App extends React.Component<any, any> {
+class App extends React.Component<any> {
     render() {
         return (
             <div>
diff --git a/types/react-motion-slider/index.d.ts b/types/react-motion-slider/index.d.ts
index bcd5924a31..3bc8f75400 100644
--- a/types/react-motion-slider/index.d.ts
+++ b/types/react-motion-slider/index.d.ts
@@ -68,7 +68,7 @@ declare module "react-motion-slider" {
         afterSlide?: (currentIndex: number) => void;
     }
 
-    export default class Slider extends React.Component<SliderProps, {}> {
+    export default class Slider extends React.Component<SliderProps> {
         /**
          * Moves to next slide
          */
diff --git a/types/react-motion-slider/react-motion-slider-tests.tsx b/types/react-motion-slider/react-motion-slider-tests.tsx
index 783f2356a3..3dc94cef99 100644
--- a/types/react-motion-slider/react-motion-slider-tests.tsx
+++ b/types/react-motion-slider/react-motion-slider-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import Slider from "react-motion-slider";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component<{}> {
     protected slider: Slider;
 
     public render() {
diff --git a/types/react-motion/index.d.ts b/types/react-motion/index.d.ts
index 20bad3de36..a60b2d57a9 100644
--- a/types/react-motion/index.d.ts
+++ b/types/react-motion/index.d.ts
@@ -70,7 +70,7 @@ interface MotionProps {
     onRest?: () => void;
 }
 
-export declare class Motion extends Component<MotionProps, any> { }
+export declare class Motion extends Component<MotionProps> { }
 
 // === TransitionMotion ===
 interface TransitionStyle {
@@ -123,7 +123,7 @@ interface TransitionProps {
      */
     willLeave?: (styleThatLeft: TransitionStyle) => Style | void;
 }
-export class TransitionMotion extends Component<TransitionProps, any> { }
+export class TransitionMotion extends Component<TransitionProps> { }
 
 
 interface StaggeredMotionProps {
@@ -137,7 +137,7 @@ interface StaggeredMotionProps {
      */
     styles: (previousInterpolatedStyles?: Array<PlainStyle>) => Array<Style>;
 }
-export declare class StaggeredMotion extends Component<StaggeredMotionProps, any> { }
+export declare class StaggeredMotion extends Component<StaggeredMotionProps> { }
 
 
 /**
diff --git a/types/react-motion/react-motion-tests.tsx b/types/react-motion/react-motion-tests.tsx
index 7396270e52..5ddb55e049 100644
--- a/types/react-motion/react-motion-tests.tsx
+++ b/types/react-motion/react-motion-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {StaggeredMotion, Motion, spring, TransitionMotion, TransitionPlainStyle, TransitionStyle, Style, PlainStyle} from 'react-motion';
 
-class Root extends React.Component<{}, {}> {
+class Root extends React.Component<{}> {
     render() {
         return (
             <Motion defaultStyle={{ x: 0 }} style = {{ x: spring(10) }}>
@@ -11,7 +11,7 @@ class Root extends React.Component<{}, {}> {
     }
 }
 
-class TransitionTest extends React.Component<{}, {}> {
+class TransitionTest extends React.Component<{}> {
     render() {
         return (
             <TransitionMotion defaultStyles={this.getDefaultStyles() }
@@ -65,7 +65,7 @@ class TransitionTest extends React.Component<{}, {}> {
     }
 }
 
-class StaggeredTest extends React.Component<{}, {}> {
+class StaggeredTest extends React.Component<{}> {
     render() {
         return (
             <StaggeredMotion defaultStyles={[{ h: 0 }, { h: 0 }, { h: 0 }]}
diff --git a/types/react-native-datepicker/index.d.ts b/types/react-native-datepicker/index.d.ts
index ea1f779810..4d8293362c 100644
--- a/types/react-native-datepicker/index.d.ts
+++ b/types/react-native-datepicker/index.d.ts
@@ -27,7 +27,7 @@ interface DatePickerProps {
     minuteInterval?: number;
 }
 
-declare class DatePicker extends React.Component<DatePickerProps, {}> {
+declare class DatePicker extends React.Component<DatePickerProps> {
     constructor(props: DatePickerProps);
 }
 
diff --git a/types/react-native-drawer-layout/index.d.ts b/types/react-native-drawer-layout/index.d.ts
index 650b2b4cdd..f6cf7a0d4a 100644
--- a/types/react-native-drawer-layout/index.d.ts
+++ b/types/react-native-drawer-layout/index.d.ts
@@ -93,7 +93,7 @@ export interface DrawerLayoutProperties extends ViewProperties {
   useNativeAnimations?: boolean;
 }
 
-export default class DrawerLayout extends React.Component<DrawerLayoutProperties, {}> {
+export default class DrawerLayout extends React.Component<DrawerLayoutProperties> {
   /**
    * Opens the drawer.
    */
diff --git a/types/react-native-drawer/index.d.ts b/types/react-native-drawer/index.d.ts
index bda1b44a7e..c36b3614f7 100644
--- a/types/react-native-drawer/index.d.ts
+++ b/types/react-native-drawer/index.d.ts
@@ -178,4 +178,4 @@ export interface DrawerProperties {
     elevation?: number;
 }
 
-export default class Drawer extends React.Component<DrawerProperties, {}> { }
+export default class Drawer extends React.Component<DrawerProperties> { }
diff --git a/types/react-native-goby/react-native-goby-tests.tsx b/types/react-native-goby/react-native-goby-tests.tsx
index 6c8ed6737b..6489d27dc5 100644
--- a/types/react-native-goby/react-native-goby-tests.tsx
+++ b/types/react-native-goby/react-native-goby-tests.tsx
@@ -7,7 +7,7 @@ import {
 
 import Goby from "react-native-goby";
 
-class Home extends React.Component<any, any> {
+class Home extends React.Component<any> {
     render() {
         return (
             <View></View>
diff --git a/types/react-native-scrollable-tab-view/index.d.ts b/types/react-native-scrollable-tab-view/index.d.ts
index af340ee6dc..2ee0982c86 100644
--- a/types/react-native-scrollable-tab-view/index.d.ts
+++ b/types/react-native-scrollable-tab-view/index.d.ts
@@ -103,5 +103,5 @@ export interface ScrollableTabViewProperties extends React.Props<ScrollableTabVi
   prerenderingSiblingsNumber?: number;
 }
 
-export default class ScrollableTabView extends React.Component<ScrollableTabViewProperties, {}> {
+export default class ScrollableTabView extends React.Component<ScrollableTabViewProperties> {
 }
diff --git a/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx b/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
index 7953a4bbae..df89ba6269 100644
--- a/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
+++ b/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
@@ -9,7 +9,7 @@ interface MyTextProperties extends React.Props<MyText> {
 
   text: string;
 }
-class MyText extends React.Component<MyTextProperties, {}> {
+class MyText extends React.Component<MyTextProperties> {
   constructor(props: MyTextProperties) {
     super(props);
   }
@@ -21,7 +21,7 @@ class MyText extends React.Component<MyTextProperties, {}> {
   }
 }
 
-class ScrollableTabViewDemo extends React.Component<{}, {}> {
+class ScrollableTabViewDemo extends React.Component<{}> {
   constructor(props: ScrollableTabViewDemo) {
     super(props);
   }
diff --git a/types/react-native-snap-carousel/index.d.ts b/types/react-native-snap-carousel/index.d.ts
index 4b340f0cb0..cbcfbc101e 100644
--- a/types/react-native-snap-carousel/index.d.ts
+++ b/types/react-native-snap-carousel/index.d.ts
@@ -177,4 +177,4 @@ export interface CarouselStatic extends React.ComponentClass<CarouselProps> {
 
 export type CarouselProperties = ScrollViewProperties & CarouselProps & React.Props<CarouselStatic>;
 
-export default class Carousel extends React.Component<CarouselProperties, {}> { }
+export default class Carousel extends React.Component<CarouselProperties> { }
diff --git a/types/react-native-snap-carousel/react-native-snap-carousel-tests.tsx b/types/react-native-snap-carousel/react-native-snap-carousel-tests.tsx
index 9f0d29792a..440d92bf31 100644
--- a/types/react-native-snap-carousel/react-native-snap-carousel-tests.tsx
+++ b/types/react-native-snap-carousel/react-native-snap-carousel-tests.tsx
@@ -11,7 +11,7 @@ import {
 
 import Carousel from 'react-native-snap-carousel';
 
-class SnapCarouselTest extends React.Component<{}, {}> {
+class SnapCarouselTest extends React.Component<{}> {
     render(): React.ReactElement<any> {
         return (
             <View>
diff --git a/types/react-native-sortable-list/react-native-sortable-list-tests.tsx b/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
index 91be1dfed4..4caa0c2f9f 100644
--- a/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
+++ b/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
@@ -105,7 +105,7 @@ const styles = StyleSheet.create({
 
 });
 
-class Basic extends React.Component<void, void> {
+class Basic extends React.Component<void> {
     render() {
         return (
             <View style={styles.container}>
diff --git a/types/react-native-swiper/react-native-swiper-tests.tsx b/types/react-native-swiper/react-native-swiper-tests.tsx
index 0dedb9cb5a..eb4e013904 100644
--- a/types/react-native-swiper/react-native-swiper-tests.tsx
+++ b/types/react-native-swiper/react-native-swiper-tests.tsx
@@ -9,7 +9,7 @@ import {
 } from 'react-native';
 import Swiper, { SwiperState } from 'react-native-swiper';
 
-class SwiperTest extends React.Component<{}, {}> {
+class SwiperTest extends React.Component<{}> {
   constructor(props: {}) {
     super(props);
   }
diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 39d6366c30..8b31bfed0d 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -70,7 +70,7 @@ export interface VideoProperties extends ViewProperties {
     rotation?: number;
 }
 
-export default class Video extends React.Component<VideoProperties, {}> {
+export default class Video extends React.Component<VideoProperties> {
     seek(time: number): void;
     presentFullscreenPlayer(): void;
     dismissFullscreenPlayer(): void;
diff --git a/types/react-native-video/react-native-video-tests.tsx b/types/react-native-video/react-native-video-tests.tsx
index bc240853f5..8bb72664ff 100644
--- a/types/react-native-video/react-native-video-tests.tsx
+++ b/types/react-native-video/react-native-video-tests.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react-native';
 import Video from 'react-native-video';
 
-class SwiperTest extends React.Component<{}, {}> {
+class SwiperTest extends React.Component<{}> {
     constructor(props: {}) {
         super(props);
     }
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 1a34d565cb..649c3351fb 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -332,7 +332,7 @@ export interface NativeMethodsMixinStatic {
     blur(): void;
 
     refs: {
-        [key: string]: React.Component<any, any>
+        [key: string]: React.Component<any>
     };
 }
 
@@ -8838,7 +8838,7 @@ export function requireNativeComponent<P>(
     extraConfig?: {nativeOnly?: any}
 ): React.ComponentClass<P>;
 
-export function findNodeHandle(componentOrHandle: null | number | React.Component<any, any> | React.ComponentClass<any>): null | number;
+export function findNodeHandle(componentOrHandle: null | number | React.Component<any> | React.ComponentClass<any>): null | number;
 
 export function processColor(color: any): number;
 
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 3d7ddeac07..cd18dfe736 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -98,7 +98,7 @@ const stylesAlt = StyleSheet.create(
     }
 );
 
-class CustomView extends React.Component<{}, {}> {
+class CustomView extends React.Component<{}> {
 
     render() {
         return (
@@ -108,7 +108,7 @@ class CustomView extends React.Component<{}, {}> {
 
 }
 
-class Welcome extends React.Component<any, any> {
+class Welcome extends React.Component<any> {
     refs: {
         [key: string]: any
         rootView: View
@@ -227,7 +227,7 @@ export class SectionListTest {
     }
 }
 
-export class CapsLockComponent extends React.Component<TextProperties, {}> {
+export class CapsLockComponent extends React.Component<TextProperties> {
     render() {
         const content = (this.props.children || "") as string
         return (
@@ -258,7 +258,7 @@ class ScrollerListComponentTest extends React.Component<{}, { dataSource: ListVi
 }
 
 
-class TabBarTest extends React.Component<{}, {}> {
+class TabBarTest extends React.Component<{}> {
     render() {
         return (
             <TabBarIOS
diff --git a/types/react-native/test/init-example.tsx b/types/react-native/test/init-example.tsx
index f6fce83849..1f1bf17a22 100644
--- a/types/react-native/test/init-example.tsx
+++ b/types/react-native/test/init-example.tsx
@@ -6,7 +6,7 @@ import {
   View
 } from 'react-native';
 
-export default class AwesomeProject extends React.Component<{}, {}> {
+export default class AwesomeProject extends React.Component<{}> {
   render() {
     return (
       <View style={styles.container}>
diff --git a/types/react-notification-system-redux/index.d.ts b/types/react-notification-system-redux/index.d.ts
index 0a3cb5d0ea..43161bfa55 100644
--- a/types/react-notification-system-redux/index.d.ts
+++ b/types/react-notification-system-redux/index.d.ts
@@ -12,7 +12,7 @@ export as namespace Notifications;
 
 export = Notifications;
 
-declare class Notifications extends Component<Notifications.NotificationsProps, any> {}
+declare class Notifications extends Component<Notifications.NotificationsProps> {}
 
 declare namespace Notifications {
     type NotificationsState = Notification[];
diff --git a/types/react-notification-system-redux/react-notification-system-redux-tests.tsx b/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
index 83c8354c83..20939e9fa5 100644
--- a/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
+++ b/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
@@ -4,7 +4,7 @@ import { Notification } from "react-notification-system";
 import * as Notifications from "react-notification-system-redux";
 import { reducer, show, hide, info, error, warning, success, NotificationLevel } from "react-notification-system-redux";
 
-class Test extends React.Component<any, any> {
+class Test extends React.Component<any> {
     private test() {
         const notification: Notification = {
             message : "Test"
diff --git a/types/react-notification-system/react-notification-system-tests.tsx b/types/react-notification-system/react-notification-system-tests.tsx
index 3a7e2dd279..d15091bb2b 100644
--- a/types/react-notification-system/react-notification-system-tests.tsx
+++ b/types/react-notification-system/react-notification-system-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as NotificationSystem from 'react-notification-system';
 
-class MyComponent extends React.Component<any, any> {
+class MyComponent extends React.Component<any> {
     private notificationSystem: NotificationSystem.System = null;
 
     private notification: NotificationSystem.Notification = {
diff --git a/types/react-onclickoutside/react-onclickoutside-tests.tsx b/types/react-onclickoutside/react-onclickoutside-tests.tsx
index 0c961de51d..d075a5e123 100644
--- a/types/react-onclickoutside/react-onclickoutside-tests.tsx
+++ b/types/react-onclickoutside/react-onclickoutside-tests.tsx
@@ -23,7 +23,7 @@ render(
     document.getElementById("main")
 );
 
-class TestComponent extends React.Component<{ disableOnClickOutside(): void; enableOnClickOutside(): void; }, {}> {
+class TestComponent extends React.Component<{ disableOnClickOutside(): void; enableOnClickOutside(): void; }> {
     handleClickOutside = () => {
         console.log('this.handleClickOutside');
     }
diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index 66b13d6855..b213fec2b0 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -41,13 +41,13 @@ export class SplitterSide extends Component<{
     mode?: "collapse" | "split"
 }, any> { }
 
-export class SplitterContent extends Component<{}, any> { }
+export class SplitterContent extends Component<{}> { }
 
-export class Splitter extends Component<{}, any> { }
+export class Splitter extends Component<{}> { }
 
 /*** toolbar ***/
 
-export class Toolbar extends Component<{}, any> {}
+export class Toolbar extends Component<{}> {}
 
 export class BottomToolbar extends Component<{
     modifier?: string
@@ -180,7 +180,7 @@ export class Modal extends Component<{
 }, any> {}
 
 export class Popover extends Component<{
-    getTarget?(): Component<any, any> | HTMLElement,
+    getTarget?(): Component<any> | HTMLElement,
     onCancel?(): void,
     isOpen?: boolean,
     isCancelable?: boolean,
@@ -261,11 +261,11 @@ export class Switch extends Component<{
  * Tabs
  */
 
-export class Tab extends Component<{}, any> { }
+export class Tab extends Component<{}> { }
 
-export class TabActive extends Component<{}, any> { }
+export class TabActive extends Component<{}> { }
 
-export class TabInactive extends Component<{}, any> { }
+export class TabInactive extends Component<{}> { }
 
 export class Tabbar extends Component<{
     index?: number,
diff --git a/types/react-overlays/index.d.ts b/types/react-overlays/index.d.ts
index 5112ecef26..450e8e2e93 100644
--- a/types/react-overlays/index.d.ts
+++ b/types/react-overlays/index.d.ts
@@ -84,7 +84,7 @@ export interface AffixProps {
 	 */
 	onAffixedBottom?(): void;
 }
-export class Affix extends React.Component<AffixProps, {}> { }
+export class Affix extends React.Component<AffixProps> { }
 
 // <AutoAffix />
 export interface AutoAffixProps extends AffixProps {
@@ -99,7 +99,7 @@ export interface AutoAffixProps extends AffixProps {
 	 */
 	autoWidth?: boolean;
 }
-export class AutoAffix extends React.Component<AutoAffixProps, {}> { }
+export class AutoAffix extends React.Component<AutoAffixProps> { }
 
 // <Transition />
 export interface TransitionProps {
@@ -181,4 +181,4 @@ export interface TransitionProps {
 	 */
 	onExited?(element: Element): void;
 }
-export class Transition extends React.Component<TransitionProps, {}> { }
+export class Transition extends React.Component<TransitionProps> { }
diff --git a/types/react-overlays/lib/RootCloseWrapper.d.ts b/types/react-overlays/lib/RootCloseWrapper.d.ts
index 384df80f4a..cfe4955f29 100644
--- a/types/react-overlays/lib/RootCloseWrapper.d.ts
+++ b/types/react-overlays/lib/RootCloseWrapper.d.ts
@@ -17,6 +17,6 @@ interface RootCloseWrapperProps {
 	event?: 'click' | 'mousedown';
 }
 
-declare class RootCloseWrapper extends React.Component<RootCloseWrapperProps, {}> { }
+declare class RootCloseWrapper extends React.Component<RootCloseWrapperProps> { }
 declare namespace RootCloseWrapper { } // module export workaround: https://github.com/Microsoft/TypeScript/issues/5073
 export = RootCloseWrapper;
diff --git a/types/react-overlays/react-overlays-tests.tsx b/types/react-overlays/react-overlays-tests.tsx
index bbe526853f..54d53ca827 100644
--- a/types/react-overlays/react-overlays-tests.tsx
+++ b/types/react-overlays/react-overlays-tests.tsx
@@ -17,7 +17,7 @@ function testTransition() {
   );
 }
 
-class TestAffix extends React.Component<{}, {}> {
+class TestAffix extends React.Component<{}> {
   render(): JSX.Element {
     return (
       <div>
@@ -29,7 +29,7 @@ class TestAffix extends React.Component<{}, {}> {
   }
 }
 
-class TestRootCloseWrapper extends React.Component<{}, {}> {
+class TestRootCloseWrapper extends React.Component<{}> {
   handleRootClose = () => { };
   render() {
     return (
diff --git a/types/react-paginate/react-paginate-tests.tsx b/types/react-paginate/react-paginate-tests.tsx
index 31efb805ce..d1e893fddf 100644
--- a/types/react-paginate/react-paginate-tests.tsx
+++ b/types/react-paginate/react-paginate-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import ReactPaginate = require("react-paginate");
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component<{}> {
     render() {
         return (
             <ReactPaginate
diff --git a/types/react-pointable/index.d.ts b/types/react-pointable/index.d.ts
index 4c0cec6600..e2db8d2fb4 100644
--- a/types/react-pointable/index.d.ts
+++ b/types/react-pointable/index.d.ts
@@ -22,7 +22,7 @@ export interface PointableProps extends React.HTMLAttributes<HTMLElement> {
     onPointerCancel?(evt: PointerEvent): void;
 }
 
-export default class Pointable extends React.Component<PointableProps, {}> {
+export default class Pointable extends React.Component<PointableProps> {
     static defaultProps: {
         tagName: 'div',
         touchAction: 'auto'
diff --git a/types/react-portal/react-portal-tests.tsx b/types/react-portal/react-portal-tests.tsx
index f3bd6d4b83..19b5e6a59c 100644
--- a/types/react-portal/react-portal-tests.tsx
+++ b/types/react-portal/react-portal-tests.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as Portal from "react-portal";
 
-export default class App extends React.Component<{}, {}> {
+export default class App extends React.Component<{}> {
   render() {
     const button1 = <button>Open portal with pseudo modal</button>;
 
@@ -18,7 +18,7 @@ export default class App extends React.Component<{}, {}> {
   }
 }
 
-export class PseudoModal extends React.Component<{ closePortal?(): {} }, {}> {
+export class PseudoModal extends React.Component<{ closePortal?(): {} }> {
   render() {
     return (
       <div>
diff --git a/types/react-props-decorators/react-props-decorators-tests.ts b/types/react-props-decorators/react-props-decorators-tests.ts
index 654c2df98f..2d1bb490ce 100644
--- a/types/react-props-decorators/react-props-decorators-tests.ts
+++ b/types/react-props-decorators/react-props-decorators-tests.ts
@@ -9,6 +9,6 @@ import { propTypes, defaultProps } from 'react-props-decorators';
     foo: "defaultString",
     bar: 100
 })
-class Baz extends React.Component<any, any> {
+class Baz extends React.Component<any> {
     /* ... */
 }
diff --git a/types/react-recaptcha/index.d.ts b/types/react-recaptcha/index.d.ts
index e861c4e73b..e902c11040 100644
--- a/types/react-recaptcha/index.d.ts
+++ b/types/react-recaptcha/index.d.ts
@@ -24,7 +24,7 @@ interface RecaptchaProps {
     sitekey?: string;
 }
 
-declare class Recaptcha extends Component<RecaptchaProps, any> {
+declare class Recaptcha extends Component<RecaptchaProps> {
     static propTypes: any;
     static defaultProps: RecaptchaProps;
 }
diff --git a/types/react-redux-i18n/index.d.ts b/types/react-redux-i18n/index.d.ts
index f92e9d3395..2195dfaeaa 100644
--- a/types/react-redux-i18n/index.d.ts
+++ b/types/react-redux-i18n/index.d.ts
@@ -44,8 +44,8 @@ declare module 'react-redux-i18n' {
   /**
    * React components
    */
-  export class Translate extends react.Component<TranslateProps, any>{ }
-  export class Localize extends react.Component<LocalizeProps, any>{ }
+  export class Translate extends react.Component<TranslateProps>{ }
+  export class Localize extends react.Component<LocalizeProps>{ }
 
   /**
    * Reducer
diff --git a/types/react-redux-i18n/react-redux-i18n-tests.tsx b/types/react-redux-i18n/react-redux-i18n-tests.tsx
index 1887c11880..cf1f24ee4b 100644
--- a/types/react-redux-i18n/react-redux-i18n-tests.tsx
+++ b/types/react-redux-i18n/react-redux-i18n-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as I18n from "react-redux-i18n";
 
-class ReactReduxI18nTests_Translate1 extends React.Component<React.Props<{}>, {}>{
+class ReactReduxI18nTests_Translate1 extends React.Component<React.Props<{}>>{
 
   render() {
     return (
@@ -12,7 +12,7 @@ class ReactReduxI18nTests_Translate1 extends React.Component<React.Props<{}>, {}
 
 
 
-class ReactReduxI18nTests_Translate2 extends React.Component<React.Props<{}>, {}>{
+class ReactReduxI18nTests_Translate2 extends React.Component<React.Props<{}>>{
 
   render() {
     return (
@@ -22,7 +22,7 @@ class ReactReduxI18nTests_Translate2 extends React.Component<React.Props<{}>, {}
 }
 
 
-class ReactReduxI18nTests_Translate3 extends React.Component<React.Props<{}>, {}>{
+class ReactReduxI18nTests_Translate3 extends React.Component<React.Props<{}>>{
 
   render() {
     return (
@@ -32,7 +32,7 @@ class ReactReduxI18nTests_Translate3 extends React.Component<React.Props<{}>, {}
 }
 
 
-class ReactReduxI18nTests_Translate4 extends React.Component<React.Props<{}>, {}>{
+class ReactReduxI18nTests_Translate4 extends React.Component<React.Props<{}>>{
 
   render() {
     return (
diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index dee0dcba64..85a7b22bc8 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -32,7 +32,7 @@ declare module "react-redux-toastr" {
     /**
      * Toastr react component.
      */
-    export default class ReduxToastr extends React.Component<ToastrOptions, any>{ }
+    export default class ReduxToastr extends React.Component<ToastrOptions>{ }
 
     interface EmitterOptions {
         /**
@@ -46,7 +46,7 @@ declare module "react-redux-toastr" {
         timeOut?: number,
         removeOnHover?: boolean,
         removeOnClick?: boolean,
-        component?: React.Component<any, any>,
+        component?: React.Component<any>,
         onShowComplete?(): void;
         onHideComplete?(): void;
     }
diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index c67c2f7cb3..c21ea1c33b 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -176,4 +176,4 @@ export interface ProviderProps {
 /**
  * Makes the Redux store available to the connect() calls in the component hierarchy below.
  */
-export class Provider extends React.Component<ProviderProps, {}> { }
+export class Provider extends React.Component<ProviderProps> { }
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index 7e5ac0f6ae..a5ed705989 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -15,7 +15,7 @@ interface CounterState {
 }
 declare var increment: Function;
 
-class Counter extends Component<any, any> {
+class Counter extends Component<any> {
     render() {
         return (
             <button onClick={this.props.onIncrement}>
@@ -45,7 +45,7 @@ connect(
 
 
 @connect(mapStateToProps)
-class CounterContainer extends Component<any, any> {
+class CounterContainer extends Component<any> {
 
 }
 
@@ -85,7 +85,7 @@ connect<ICounterStateProps, ICounterDispatchProps, {}, ICounterStateProps & ICou
 )(Counter);
 
 
-class App extends Component<any, any> {
+class App extends Component<any> {
     render(): JSX.Element {
         // ...
         return null;
@@ -105,10 +105,10 @@ ReactDOM.render((
 // https://github.com/rackt/react-redux/blob/master/docs/api.md
 //
 declare var store: Store<TodoState>;
-class MyRootComponent extends Component<any, any> {
+class MyRootComponent extends Component<any> {
 
 }
-class TodoApp extends Component<any, any> {}
+class TodoApp extends Component<any> {}
 interface TodoState {
     todos: string[]|string;
 }
@@ -343,7 +343,7 @@ namespace TestTOwnPropsInference {
         state: string;
     }
 
-    class OwnPropsComponent extends React.Component<StateProps & OwnProps & DispatchProp<any>, void> {
+    class OwnPropsComponent extends React.Component<StateProps & OwnProps & DispatchProp<any>> {
         render() {
             return <div/>;
         }
@@ -381,7 +381,7 @@ namespace TestTOwnPropsInference {
         state: string
     }
 
-    class AllPropsComponent extends React.Component<AllProps & DispatchProp<any>, void> {
+    class AllPropsComponent extends React.Component<AllProps & DispatchProp<any>> {
         render() {
             return <div/>;
         }
@@ -415,7 +415,7 @@ namespace TestMergedPropsInference {
         merged: string;
     }
 
-    class MergedPropsComponent extends React.Component<MergedProps, void> {
+    class MergedPropsComponent extends React.Component<MergedProps> {
         render() {
             return <div/>;
         }
@@ -463,7 +463,7 @@ namespace Issue16652 {
         comments: ({ id: string } | undefined)[];
     }
 
-    class CommentList extends React.Component<PassedProps & GeneratedStateProps & DispatchProp<any>, void> {}
+    class CommentList extends React.Component<PassedProps & GeneratedStateProps & DispatchProp<any>> {}
 
     const mapStateToProps = (state: any, ownProps: PassedProps): GeneratedStateProps => {
         return {
diff --git a/types/react-relay/react-relay-tests.tsx b/types/react-relay/react-relay-tests.tsx
index 091909cabd..03559644b7 100644
--- a/types/react-relay/react-relay-tests.tsx
+++ b/types/react-relay/react-relay-tests.tsx
@@ -49,7 +49,7 @@ interface ArtworkProps {
     relay: Relay.RelayProp,
 }
 
-class Artwork extends React.Component<ArtworkProps, null> {
+class Artwork extends React.Component<ArtworkProps> {
     render() {
         return (
             <a href={`/artworks/${this.props.relay.variables.artworkID}`}>
@@ -69,7 +69,7 @@ const ArtworkContainer = Relay.createContainer(Artwork, {
     }
 })
 
-class StubbedArtwork extends React.Component<null, null> {
+class StubbedArtwork extends React.Component<null> {
     render() {
         const props = {
             artwork: { title: "CHAMPAGNE FORMICA FLAG" },
diff --git a/types/react-responsive/index.d.ts b/types/react-responsive/index.d.ts
index 2b9a37839f..3b6e456c73 100644
--- a/types/react-responsive/index.d.ts
+++ b/types/react-responsive/index.d.ts
@@ -59,7 +59,7 @@ declare module "react-responsive" {
         }
     }
 
-    class MediaQuery extends React.Component<MediaQuery.MediaQueryProps, any> { }
+    class MediaQuery extends React.Component<MediaQuery.MediaQueryProps> { }
     export = MediaQuery;
 
 }
diff --git a/types/react-responsive/react-responsive-tests.tsx b/types/react-responsive/react-responsive-tests.tsx
index 02b948c8a4..881ecc4817 100644
--- a/types/react-responsive/react-responsive-tests.tsx
+++ b/types/react-responsive/react-responsive-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as MediaQuery from "react-responsive";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component<{}> {
     render() {
         return (
             <div>
diff --git a/types/react-router-bootstrap/react-router-bootstrap-tests.tsx b/types/react-router-bootstrap/react-router-bootstrap-tests.tsx
index 455446f225..7c50cf344d 100644
--- a/types/react-router-bootstrap/react-router-bootstrap-tests.tsx
+++ b/types/react-router-bootstrap/react-router-bootstrap-tests.tsx
@@ -3,7 +3,7 @@ import { Component, CSSProperties } from 'react';
 import { Button } from 'react-bootstrap';
 import { LinkContainer, IndexLinkContainer } from 'react-router-bootstrap'
 
-export class ReactRouterBootstrapTest extends Component<any, any> {
+export class ReactRouterBootstrapTest extends Component<any> {
     callback() {
         alert('Callback: ' + JSON.stringify(arguments));
     }
diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index 1f7610ce5f..44725be863 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -30,20 +30,20 @@ declare module 'react-router-dom' {
     forceRefresh?: boolean;
     keyLength?: number;
   }
-  class BrowserRouter extends React.Component<BrowserRouterProps, void> {}
+  class BrowserRouter extends React.Component<BrowserRouterProps> {}
 
   interface HashRouterProps {
     basename?: string;
     getUserConfirmation?(): void;
     hashType?: 'slash' | 'noslash' | 'hashbang';
   }
-  class HashRouter extends React.Component<HashRouterProps, void> {}
+  class HashRouter extends React.Component<HashRouterProps> {}
 
   interface LinkProps extends React.HTMLAttributes<HTMLAnchorElement> {
     to: H.LocationDescriptor;
     replace?: boolean;
   }
-  class Link extends React.Component<LinkProps, void> {}
+  class Link extends React.Component<LinkProps> {}
 
   interface NavLinkProps extends LinkProps {
     activeClassName?: string;
@@ -52,7 +52,7 @@ declare module 'react-router-dom' {
     strict?: boolean;
     isActive?<P>(match: match<P>, location: H.Location): boolean;
   }
-  class NavLink extends React.Component<NavLinkProps, void> {}
+  class NavLink extends React.Component<NavLinkProps> {}
 
   export {
     BrowserRouter,
diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index 9e7639748e..cf7a6cc410 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -23,7 +23,7 @@ export interface ConnectedRouterProps<State> {
     store?: Store<State>;
     history?: History;
 }
-export class ConnectedRouter<State> extends React.Component<ConnectedRouterProps<State>, {}> {}
+export class ConnectedRouter<State> extends React.Component<ConnectedRouterProps<State>> {}
 
 export const LOCATION_CHANGE: string;
 
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 6eaa39b3bb..72afa50e3b 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -37,13 +37,13 @@ export interface MemoryRouterProps {
   keyLength?: number;
 }
 
-export class MemoryRouter extends React.Component<MemoryRouterProps, void> { }
+export class MemoryRouter extends React.Component<MemoryRouterProps> { }
 
 export interface PromptProps {
   message: string | ((location: H.Location) => void);
   when?: boolean;
 }
-export class Prompt extends React.Component<PromptProps, void> { }
+export class Prompt extends React.Component<PromptProps> { }
 
 export interface RedirectProps {
   to: H.LocationDescriptor;
@@ -53,7 +53,7 @@ export interface RedirectProps {
   exact?: boolean;
   strict?: boolean;
 }
-export class Redirect extends React.Component<RedirectProps, void> { }
+export class Redirect extends React.Component<RedirectProps> { }
 
 export interface RouteComponentProps<P> {
   match: match<P>;
@@ -71,12 +71,12 @@ export interface RouteProps {
   exact?: boolean;
   strict?: boolean;
 }
-export class Route extends React.Component<RouteProps, {}> { }
+export class Route extends React.Component<RouteProps> { }
 
 export interface RouterProps {
   history: any;
 }
-export class Router extends React.Component<RouterProps, {}> { }
+export class Router extends React.Component<RouterProps> { }
 
 export interface StaticRouterProps {
   basename?: string;
@@ -84,12 +84,12 @@ export interface StaticRouterProps {
   context?: object;
 }
 
-export class StaticRouter extends React.Component<StaticRouterProps, {}> { }
+export class StaticRouter extends React.Component<StaticRouterProps> { }
 export interface SwitchProps {
   children?: React.ReactNode;
   location?: H.Location;
 }
-export class Switch extends React.Component<SwitchProps, {}> { }
+export class Switch extends React.Component<SwitchProps> { }
 
 export interface match<P> {
   params: P;
diff --git a/types/react-router/test/ModalGallery.tsx b/types/react-router/test/ModalGallery.tsx
index 3d7aadd0f7..f4b55aca20 100644
--- a/types/react-router/test/ModalGallery.tsx
+++ b/types/react-router/test/ModalGallery.tsx
@@ -16,7 +16,7 @@ import {
 // are the same as before but now we see them inside a modal
 // on top of the old screen.
 
-class ModalSwitch extends React.Component<RouteComponentProps<void>, void> {
+class ModalSwitch extends React.Component<RouteComponentProps<void>> {
   // We can pass a location to <Switch/> that will tell it to
   // ignore the router's current location and use the location
   // prop instead.
diff --git a/types/react-router/test/NavigateWithContext.tsx b/types/react-router/test/NavigateWithContext.tsx
index 89b53aef58..7a58090462 100644
--- a/types/react-router/test/NavigateWithContext.tsx
+++ b/types/react-router/test/NavigateWithContext.tsx
@@ -13,7 +13,7 @@ interface Params {
 }
 type Props = RouteComponentProps<Params>;
 
-class ComponentThatUsesContext extends React.Component<Props, {}> {
+class ComponentThatUsesContext extends React.Component<Props> {
   static contextTypes = {
     router: React.PropTypes.object.isRequired
   };
diff --git a/types/react-router/test/StaticRouter.tsx b/types/react-router/test/StaticRouter.tsx
index 89999d84cb..4d6b40c933 100644
--- a/types/react-router/test/StaticRouter.tsx
+++ b/types/react-router/test/StaticRouter.tsx
@@ -35,7 +35,7 @@ const PrintContext: React.SFC<PrintContextProps> = (props) => (
     </p>
 );
 
-class StaticRouterExample extends React.Component<{}, {}> {
+class StaticRouterExample extends React.Component<{}> {
     staticContext: StaticContext = {};
 
     render() {
diff --git a/types/react-router/v2/lib/withRouter.d.ts b/types/react-router/v2/lib/withRouter.d.ts
index 71330bbb21..0add30e383 100644
--- a/types/react-router/v2/lib/withRouter.d.ts
+++ b/types/react-router/v2/lib/withRouter.d.ts
@@ -1,4 +1,4 @@
 import * as React from 'react';
 
-declare function withRouter<C extends React.ComponentClass<any> | React.StatelessComponent<any> | React.PureComponent<any, any>>(component: C): C;
+declare function withRouter<C extends React.ComponentClass<any> | React.StatelessComponent<any> | React.PureComponent<any>>(component: C): C;
 export default withRouter;
diff --git a/types/react-router/v3/react-router-tests.tsx b/types/react-router/v3/react-router-tests.tsx
index 557712e922..4470838e35 100644
--- a/types/react-router/v3/react-router-tests.tsx
+++ b/types/react-router/v3/react-router-tests.tsx
@@ -45,7 +45,7 @@ interface MasterContext {
 	router: InjectedRouter;
 }
 
-class Master extends Component<any, any> {
+class Master extends Component<any> {
 	static contextTypes: ValidationMap<any> = {
 		router: routerShape
 	};
@@ -75,7 +75,7 @@ interface DashboardProps {
 	router: InjectedRouter;
 }
 
-class Dashboard extends React.Component<DashboardProps, {}> {
+class Dashboard extends React.Component<DashboardProps> {
 	static staticMethodToBeHoisted(): void { }
 
 	navigate() {
@@ -99,7 +99,7 @@ const DashboardWithRouter = withRouter(Dashboard);
 
 DashboardWithRouter.staticMethodToBeHoisted();
 
-class NotFound extends React.Component<{}, {}> {
+class NotFound extends React.Component<{}> {
 	render() {
 		return <div>
 			This path does not exists
@@ -109,7 +109,7 @@ class NotFound extends React.Component<{}, {}> {
 
 type UsersProps = RouteComponentProps<{}, {}>;
 
-class Users extends React.Component<UsersProps, {}> {
+class Users extends React.Component<UsersProps> {
 	render() {
 		const { location, params, route, routes, router, routeParams } = this.props;
 		return <div>
diff --git a/types/react-scroll/modules/components/Button.d.ts b/types/react-scroll/modules/components/Button.d.ts
index 831ccfb49a..262e4d26e7 100644
--- a/types/react-scroll/modules/components/Button.d.ts
+++ b/types/react-scroll/modules/components/Button.d.ts
@@ -3,4 +3,4 @@ import { ReactScrollLinkProps } from "./Link";
 
 export type ButtonProps = ReactScrollLinkProps & React.HTMLProps<HTMLButtonElement>;
 
-export default class Button extends React.Component<ButtonProps, any> { }
+export default class Button extends React.Component<ButtonProps> { }
diff --git a/types/react-scroll/modules/components/Element.d.ts b/types/react-scroll/modules/components/Element.d.ts
index 53dae7ef66..411e6b6bd2 100644
--- a/types/react-scroll/modules/components/Element.d.ts
+++ b/types/react-scroll/modules/components/Element.d.ts
@@ -5,4 +5,4 @@ export interface ElementProps extends React.HTMLProps<HTMLDivElement> {
     id?: string;
 }
 
-export default class Element extends React.Component<ElementProps, any> { }
+export default class Element extends React.Component<ElementProps> { }
diff --git a/types/react-scroll/modules/components/Link.d.ts b/types/react-scroll/modules/components/Link.d.ts
index a1333c35ca..d15d460605 100644
--- a/types/react-scroll/modules/components/Link.d.ts
+++ b/types/react-scroll/modules/components/Link.d.ts
@@ -19,4 +19,4 @@ export interface ReactScrollLinkProps {
 
 export type LinkProps = ReactScrollLinkProps & React.HTMLProps<HTMLButtonElement>;
 
-export default class Link extends React.Component<LinkProps, any> { }
+export default class Link extends React.Component<LinkProps> { }
diff --git a/types/react-scroll/test/react-scroll-tests.tsx b/types/react-scroll/test/react-scroll-tests.tsx
index f341b4d241..6f76fff2d5 100644
--- a/types/react-scroll/test/react-scroll-tests.tsx
+++ b/types/react-scroll/test/react-scroll-tests.tsx
@@ -119,7 +119,7 @@ Events.scrollEvent.register('end', (to, element) => {
 Events.scrollEvent.remove('begin');
 Events.scrollEvent.remove('end');
 
-class CustomComponent extends React.Component<{}, {}> {
+class CustomComponent extends React.Component<{}> {
     render() {
         return <div>
             {this.props.children}
diff --git a/types/react-scrollbar/index.d.ts b/types/react-scrollbar/index.d.ts
index 4c42f81afe..f8ddee07c9 100644
--- a/types/react-scrollbar/index.d.ts
+++ b/types/react-scrollbar/index.d.ts
@@ -27,7 +27,7 @@ declare module "react-scrollbar" {
       swapWheelAxes?: boolean
   }
 
-  class ScrollArea extends React.Component<ScrollAreaProps, {}> {}
+  class ScrollArea extends React.Component<ScrollAreaProps> {}
 
   export = ScrollArea;
 }
diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index 7e80a43c6f..fd07b4545c 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -469,10 +469,10 @@ declare namespace ReactSelectClass {
     }
 }
 
-declare class ReactSelectClass extends React.Component<ReactSelectClass.ReactSelectProps, {}> { }
+declare class ReactSelectClass extends React.Component<ReactSelectClass.ReactSelectProps> { }
 
 declare module ReactSelectClass {
-    class Creatable extends React.Component<ReactCreatableSelectProps, {}> { }
-    class Async extends React.Component<ReactAsyncSelectProps, {}> { }
-    class AsyncCreatable extends React.Component<ReactAsyncSelectProps & ReactCreatableSelectProps, {}> { }
+    class Creatable extends React.Component<ReactCreatableSelectProps> { }
+    class Async extends React.Component<ReactAsyncSelectProps> { }
+    class AsyncCreatable extends React.Component<ReactAsyncSelectProps & ReactCreatableSelectProps> { }
 }
diff --git a/types/react-select/react-select-tests.tsx b/types/react-select/react-select-tests.tsx
index 5d603c9259..6a1d1b778b 100644
--- a/types/react-select/react-select-tests.tsx
+++ b/types/react-select/react-select-tests.tsx
@@ -77,7 +77,7 @@ const filterOptions = (options: Array<Option>, filter: string, values: Array<Opt
     return filteredOptions;
 };
 
-class SelectTest extends React.Component<React.Props<{}>, {}> {
+class SelectTest extends React.Component<React.Props<{}>> {
 
     render() {
         const options: Option[] = [{ label: "Foo", value: "bar" }];
@@ -138,7 +138,7 @@ class SelectTest extends React.Component<React.Props<{}>, {}> {
     }
 }
 
-class SelectWithStringValueTest extends React.Component<React.Props<{}>, {}> {
+class SelectWithStringValueTest extends React.Component<React.Props<{}>> {
 
     render() {
         const options: Option[] = [{
@@ -165,7 +165,7 @@ class SelectWithStringValueTest extends React.Component<React.Props<{}>, {}> {
     }
 }
 
-class SelectAsyncTest extends React.Component<React.Props<{}>, {}> {
+class SelectAsyncTest extends React.Component<React.Props<{}>> {
 
     render() {
         const getOptions = (input: string, callback: (err: any, result: AutocompleteResult) => any) => {
@@ -209,7 +209,7 @@ class SelectAsyncTest extends React.Component<React.Props<{}>, {}> {
 
 }
 
-class SelectAsyncPromiseTest extends React.Component<React.Props<{}>, {}> {
+class SelectAsyncPromiseTest extends React.Component<React.Props<{}>> {
 
     render() {
         const getOptions = (input: string): Promise<AutocompleteResult> => {
@@ -255,7 +255,7 @@ class SelectAsyncPromiseTest extends React.Component<React.Props<{}>, {}> {
 
 }
 
-class SelectCreatableTest extends React.Component<React.Props<{}>, {}> {
+class SelectCreatableTest extends React.Component<React.Props<{}>> {
 
     render() {
         const options: Option[] = [{ label: "Foo", value: "bar" }];
@@ -280,7 +280,7 @@ class SelectCreatableTest extends React.Component<React.Props<{}>, {}> {
 
 }
 
-class SelectAsyncCreatableTest extends React.Component<React.Props<{}>, {}> {
+class SelectAsyncCreatableTest extends React.Component<React.Props<{}>> {
 
     render() {
         const getOptions = (input: string, callback: Function) => {
diff --git a/types/react-side-effect/index.d.ts b/types/react-side-effect/index.d.ts
index 15ca564e0c..8ee1ab2df0 100644
--- a/types/react-side-effect/index.d.ts
+++ b/types/react-side-effect/index.d.ts
@@ -12,7 +12,7 @@ declare function withSideEffect(
     mapStateOnServer?: (state: any) => any
 ): ClassDecorator;
 
-declare class ElementClass extends React.Component<any, any> {}
+declare class ElementClass extends React.Component<any> {}
 
 interface ClassDecorator {
     <T extends (typeof ElementClass)>(component:T): T;
diff --git a/types/react-side-effect/react-side-effect-tests.ts b/types/react-side-effect/react-side-effect-tests.ts
index 353b0754f5..60566eafa7 100644
--- a/types/react-side-effect/react-side-effect-tests.ts
+++ b/types/react-side-effect/react-side-effect-tests.ts
@@ -5,7 +5,7 @@ interface DocumentTitleProps {
     title: string
 }
 
-class DocumentTitle extends React.Component<DocumentTitleProps, any> {
+class DocumentTitle extends React.Component<DocumentTitleProps> {
   public render() {
     if (this.props.children) {
       return React.Children.only(this.props.children);
diff --git a/types/react-sidebar/index.d.ts b/types/react-sidebar/index.d.ts
index 08a82fc183..b73863a079 100644
--- a/types/react-sidebar/index.d.ts
+++ b/types/react-sidebar/index.d.ts
@@ -32,4 +32,4 @@ export interface SidebarStyles {
     sidebar?: Partial<CSSStyleDeclaration>;
 }
 
-export default class Sidebar extends Component<SidebarProps, {}> {}
+export default class Sidebar extends Component<SidebarProps> {}
diff --git a/types/react-slick/react-slick-tests.tsx b/types/react-slick/react-slick-tests.tsx
index dde5f43fb4..180a80c593 100644
--- a/types/react-slick/react-slick-tests.tsx
+++ b/types/react-slick/react-slick-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { default as Slider, Settings, CustomArrowProps } from "react-slick";
 
-class LeftNavArrow extends React.Component<CustomArrowProps, {}> {
+class LeftNavArrow extends React.Component<CustomArrowProps> {
   render() {
     return <button onClick={this.props.onClick}>Next</button>;
   }
@@ -63,7 +63,7 @@ const defaultSettings: Settings = {
   prevArrow: <RightNavArrow />
 };
 
-class SliderTest extends React.Component<{}, {}> {
+class SliderTest extends React.Component<{}> {
   private slider: Slider;
   render() {
     return <div>
diff --git a/types/react-smooth-scrollbar/index.d.ts b/types/react-smooth-scrollbar/index.d.ts
index 0b488a7316..666863ed05 100644
--- a/types/react-smooth-scrollbar/index.d.ts
+++ b/types/react-smooth-scrollbar/index.d.ts
@@ -29,7 +29,7 @@ declare namespace Scrollbar {
     }
 }
 
-declare class Scrollbar extends React.Component<Scrollbar.ScrollbarProps, {}> {
+declare class Scrollbar extends React.Component<Scrollbar.ScrollbarProps> {
     /**
      * Scrollbar instance
      */
diff --git a/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx b/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
index 956df59f9c..204a8a5d53 100644
--- a/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
+++ b/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
@@ -4,7 +4,7 @@ import * as SmoothScrollbar from "react-smooth-scrollbar";
 <SmoothScrollbar className="test" alwaysShowTracks onScroll={(status, instance) => { } } />;
 <SmoothScrollbar speed={10} overscrollEffect="bounce" />;
 
-class Test extends React.Component<void, void> {
+class Test extends React.Component<void> {
     ref: SmoothScrollbar;
 
     componentDidMount() {
diff --git a/types/react-sortable-hoc/react-sortable-hoc-tests.tsx b/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
index c1f824adeb..4700612d01 100644
--- a/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
+++ b/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
@@ -13,7 +13,7 @@ interface SortableListProps {
 
 type SortableComponentState = SortableListProps;
 
-class Item extends React.Component<SortableItemProps, void> {
+class Item extends React.Component<SortableItemProps> {
     public constructor(props: SortableItemProps) {
         super(props);
     }
diff --git a/types/react-split-pane/react-split-pane-tests.tsx b/types/react-split-pane/react-split-pane-tests.tsx
index 46a13653fd..91efe8d23f 100644
--- a/types/react-split-pane/react-split-pane-tests.tsx
+++ b/types/react-split-pane/react-split-pane-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as SplitPane from "react-split-pane";
 
-class SplitPaneTest extends React.Component<React.Props<{}>, {}> {
+class SplitPaneTest extends React.Component<React.Props<{}>> {
 
     render() {
         return (
diff --git a/types/react-svg-pan-zoom/index.d.ts b/types/react-svg-pan-zoom/index.d.ts
index b65376bc0b..8ea6b07df0 100644
--- a/types/react-svg-pan-zoom/index.d.ts
+++ b/types/react-svg-pan-zoom/index.d.ts
@@ -111,7 +111,7 @@ export interface OptionalProps {
 
 	// override default toolbar component
 	// TODO: specify function type more clearly
-	customToolbar: React.Component<any, any> | React.StatelessComponent<any>;
+	customToolbar: React.Component<any> | React.StatelessComponent<any>;
 
 	// How about touch events? They are in README but not in `propTypes`.
 }
@@ -130,7 +130,7 @@ export interface RequiredProps {
 
 export type Props = RequiredProps & Partial<OptionalProps>;
 
-export class ReactSVGPanZoom extends React.Component<Props, {}> {
+export class ReactSVGPanZoom extends React.Component<Props> {
 	pan(SVGDeltaX: number, SVGDeltaY: number): void;
 	zoom(SVGPointX: number, SVGPointY: number, scaleFactor: number): void;
 	fitSelection(selectionSVGPointX: number, selectionSVGPointY: number, selectionWidth: number, selectionHeight: number): void;
diff --git a/types/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx b/types/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx
index a2d078d6d2..44da1e55d6 100644
--- a/types/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx
+++ b/types/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx
@@ -7,7 +7,7 @@ import {
   ViewerMouseEvent
 } from 'react-svg-pan-zoom';
 
-class Example1 extends React.Component<{}, {}> {
+class Example1 extends React.Component<{}> {
   Viewer: ReactSVGPanZoom;
   constructor(props: Props) {
     super(props);
diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index bbfc953be7..b0036ae119 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 
-declare class ReactSwipeable extends React.Component<ReactSwipeable.SwipeableProps, void> {}
+declare class ReactSwipeable extends React.Component<ReactSwipeable.SwipeableProps> {}
 
 declare namespace ReactSwipeable {
     type OnSwipingCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number) => void;
diff --git a/types/react-swipeable/react-swipeable-tests.tsx b/types/react-swipeable/react-swipeable-tests.tsx
index c75869bdb0..61093a203e 100644
--- a/types/react-swipeable/react-swipeable-tests.tsx
+++ b/types/react-swipeable/react-swipeable-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as Swipeable from 'react-swipeable';
 
-class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps, void> {
+class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
   private handleSwiped: Swipeable.OnSwipedCallback = () => {};
   private handleSwiping: Swipeable.OnSwipingCallback = () => {};
   private handleSwipingUp: Swipeable.OnSwipingDirectionCallback = () => {};
diff --git a/types/react-syntax-highlighter/index.d.ts b/types/react-syntax-highlighter/index.d.ts
index 95a36a4361..eb0a5c21fa 100644
--- a/types/react-syntax-highlighter/index.d.ts
+++ b/types/react-syntax-highlighter/index.d.ts
@@ -26,7 +26,7 @@ declare module 'react-syntax-highlighter/dist/light' {
         [spread: string]: any;
     }
 
-    export default class SyntaxHighlighter extends React.Component<SyntaxHighlighterProps, any> {
+    export default class SyntaxHighlighter extends React.Component<SyntaxHighlighterProps> {
 
     }
 }
diff --git a/types/react-tabs/react-tabs-tests.ts b/types/react-tabs/react-tabs-tests.ts
index cdbeeeb010..1df058f2d5 100644
--- a/types/react-tabs/react-tabs-tests.ts
+++ b/types/react-tabs/react-tabs-tests.ts
@@ -4,7 +4,7 @@ import { Tabs, TabList, Tab, TabPanel, resetIdCounter } from "react-tabs";
 
 resetIdCounter();
 
-class TestApp extends React.Component<{}, {}> {
+class TestApp extends React.Component<{}> {
     onSelect = (index: number, last: number, event: Event) => {
         console.log("selected tab: " + index.toString());
         console.log("last tab: " + last.toString());
diff --git a/types/react-test-renderer/react-test-renderer-tests.ts b/types/react-test-renderer/react-test-renderer-tests.ts
index 93c8661923..86bc89f13b 100644
--- a/types/react-test-renderer/react-test-renderer-tests.ts
+++ b/types/react-test-renderer/react-test-renderer-tests.ts
@@ -15,7 +15,7 @@ tree.props = {
 tree.children = [tree];
 tree.$$typeof = "t";
 
-class TestComponent extends React.Component<{}, {}> { }
+class TestComponent extends React.Component<{}> { }
 
 const component = React.createElement(TestComponent);
 const shallowRenderer = createRenderer();
diff --git a/types/react-tether/index.d.ts b/types/react-tether/index.d.ts
index 83445eccb8..1790b8abbc 100644
--- a/types/react-tether/index.d.ts
+++ b/types/react-tether/index.d.ts
@@ -10,7 +10,7 @@ export as namespace ReactTether;
 import * as React from 'react';
 import * as Tether from 'tether';
 
-declare class TetherComponent extends React.Component<ReactTether.TetherComponentProps, null> { }
+declare class TetherComponent extends React.Component<ReactTether.TetherComponentProps> { }
 
 declare namespace ReactTether {
     interface TetherComponentProps extends React.Props<TetherComponent>, Tether.ITetherOptions {
diff --git a/types/react-textarea-autosize/index.d.ts b/types/react-textarea-autosize/index.d.ts
index 94f34a24b9..9629be7e37 100644
--- a/types/react-textarea-autosize/index.d.ts
+++ b/types/react-textarea-autosize/index.d.ts
@@ -55,6 +55,6 @@ declare module "react-textarea-autosize" {
     /**
      * <TextareaAutosize/>
      */
-    export default class TextareaAutosize extends React.Component<TextareaAutosizeProps, any> { }
+    export default class TextareaAutosize extends React.Component<TextareaAutosizeProps> { }
 
 }
diff --git a/types/react-textarea-autosize/react-textarea-autosize-tests.tsx b/types/react-textarea-autosize/react-textarea-autosize-tests.tsx
index 2812f06f71..784d90257a 100644
--- a/types/react-textarea-autosize/react-textarea-autosize-tests.tsx
+++ b/types/react-textarea-autosize/react-textarea-autosize-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import Textarea from "react-textarea-autosize";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component<{}> {
     public ref: HTMLTextAreaElement
 
     public inputRef = (ref: HTMLTextAreaElement) => {
diff --git a/types/react-toggle/index.d.ts b/types/react-toggle/index.d.ts
index 04ea8aaa9a..356f70ed1a 100644
--- a/types/react-toggle/index.d.ts
+++ b/types/react-toggle/index.d.ts
@@ -17,4 +17,4 @@ export interface ToggleProps extends HTMLAttributes<any> {
     icons?: boolean | ToggleIcons;
 }
 
-export default class Toggle extends Component<ToggleProps, any> {}
+export default class Toggle extends Component<ToggleProps> {}
diff --git a/types/react-toggle/react-toggle-tests.tsx b/types/react-toggle/react-toggle-tests.tsx
index f138268174..4f53dc38d3 100644
--- a/types/react-toggle/react-toggle-tests.tsx
+++ b/types/react-toggle/react-toggle-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import Toggle from "react-toggle";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component<{}> {
     render() {
         return (
             <Toggle icons={ false } />
diff --git a/types/react-transition-group/CSSTransitionGroup.d.ts b/types/react-transition-group/CSSTransitionGroup.d.ts
index 0069962eb9..6786bca8fe 100644
--- a/types/react-transition-group/CSSTransitionGroup.d.ts
+++ b/types/react-transition-group/CSSTransitionGroup.d.ts
@@ -22,6 +22,6 @@ declare namespace CSSTransitionGroup {
     }
 }
 
-declare class CSSTransitionGroup extends Component<CSSTransitionGroup.CSSTransitionGroupProps, any> {}
+declare class CSSTransitionGroup extends Component<CSSTransitionGroup.CSSTransitionGroupProps> {}
 
 export = CSSTransitionGroup;
diff --git a/types/react-transition-group/TransitionGroup.d.ts b/types/react-transition-group/TransitionGroup.d.ts
index 04d218399c..44d9100889 100644
--- a/types/react-transition-group/TransitionGroup.d.ts
+++ b/types/react-transition-group/TransitionGroup.d.ts
@@ -14,6 +14,6 @@ declare namespace TransitionGroup {
     type TransitionGroupProps = HTMLTransitionGroupProps<TransitionGroup>;
 }
 
-declare class TransitionGroup extends Component<TransitionGroup.TransitionGroupProps, any> {}
+declare class TransitionGroup extends Component<TransitionGroup.TransitionGroupProps> {}
 
 export = TransitionGroup;
diff --git a/types/react-transition-group/react-transition-group-tests.tsx b/types/react-transition-group/react-transition-group-tests.tsx
index 4046adafdd..6c2e579e75 100644
--- a/types/react-transition-group/react-transition-group-tests.tsx
+++ b/types/react-transition-group/react-transition-group-tests.tsx
@@ -3,7 +3,7 @@ import * as TransitionGroup from "react-transition-group/TransitionGroup";
 import * as CSSTransitionGroup from "react-transition-group/CSSTransitionGroup";
 import { CSSTransitionGroupProps, TransitionGroupProps, TransitionGroupChildLifecycle } from "react-transition-group";
 
-class TestChild extends React.Component<any, any> implements TransitionGroupChildLifecycle {
+class TestChild extends React.Component<any> implements TransitionGroupChildLifecycle {
     componentWillAppear(callback: () => void) {
         callback();
     }
diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
index 1759a65f82..f7c5f1197c 100644
--- a/types/react-virtualized-select/index.d.ts
+++ b/types/react-virtualized-select/index.d.ts
@@ -30,5 +30,5 @@ export interface VirtualizedSelectProps extends ReactSelectProps {
     selectComponent?: React.ComponentClass<any> | React.StatelessComponent<any>;
 }
 
-declare class VirtualizedSelect extends React.PureComponent<VirtualizedSelectProps, {}> {}
+declare class VirtualizedSelect extends React.PureComponent<VirtualizedSelectProps> {}
 export default VirtualizedSelect;
diff --git a/types/react-virtualized/dist/es/CellMeasurer.d.ts b/types/react-virtualized/dist/es/CellMeasurer.d.ts
index 1f7d2de8b3..0621d5579a 100644
--- a/types/react-virtualized/dist/es/CellMeasurer.d.ts
+++ b/types/react-virtualized/dist/es/CellMeasurer.d.ts
@@ -59,7 +59,7 @@ export type CellMeasurerProps = {
  * Measurements are stored in a per-cell cache.
  * Cached-content is not be re-measured.
  */
-export class CellMeasurer extends PureComponent<CellMeasurerProps, {}> {
+export class CellMeasurer extends PureComponent<CellMeasurerProps> {
     constructor(props: CellMeasurerProps, context: any);
 
     componentDidMount(): void;
diff --git a/types/react-virtualized/dist/es/Collection.d.ts b/types/react-virtualized/dist/es/Collection.d.ts
index 9f37eea8f6..ce36885234 100644
--- a/types/react-virtualized/dist/es/Collection.d.ts
+++ b/types/react-virtualized/dist/es/Collection.d.ts
@@ -63,7 +63,7 @@ export type CollectionProps = {
  * Renders scattered or non-linear data.
  * Unlike Grid, which renders checkerboard data, Collection can render arbitrarily positioned- even overlapping- data.
  */
-export class Collection extends PureComponent<CollectionProps, {}> {
+export class Collection extends PureComponent<CollectionProps> {
     static propTypes: {
         'aria-label': Requireable<string>,
         cellCount: Validator<number>,
diff --git a/types/react-virtualized/dist/es/ColumnSizer.d.ts b/types/react-virtualized/dist/es/ColumnSizer.d.ts
index fa6788ca02..512e8db4a1 100644
--- a/types/react-virtualized/dist/es/ColumnSizer.d.ts
+++ b/types/react-virtualized/dist/es/ColumnSizer.d.ts
@@ -30,7 +30,7 @@ export type ColumnSizerProps = {
 /**
  * High-order component that auto-calculates column-widths for `Grid` cells.
  */
-export class ColumnSizer extends PureComponent<ColumnSizerProps, {}> {
+export class ColumnSizer extends PureComponent<ColumnSizerProps> {
     static propTypes: {
         children: Validator<(props: SizedColumnProps) => React.ReactNode>,
         columnMaxWidth: Requireable<number>,
diff --git a/types/react-virtualized/dist/es/InfiniteLoader.d.ts b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
index f26afd3f90..1062caeb35 100644
--- a/types/react-virtualized/dist/es/InfiniteLoader.d.ts
+++ b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
@@ -51,7 +51,7 @@ export type InfiniteLoaderProps = {
  * This component decorates a virtual component and just-in-time prefetches rows as a user scrolls.
  * It is intended as a convenience component; fork it if you'd like finer-grained control over data-loading.
  */
-export class InfiniteLoader extends PureComponent<InfiniteLoaderProps, {}> {
+export class InfiniteLoader extends PureComponent<InfiniteLoaderProps> {
     static propTypes: {
         children: Validator<(props: InfiniteLoaderChildProps) => React.ReactNode>,
         isRowLoaded: Validator<(params: Index) => boolean>,
diff --git a/types/react-virtualized/dist/es/List.d.ts b/types/react-virtualized/dist/es/List.d.ts
index c38a20c182..94dde630fd 100644
--- a/types/react-virtualized/dist/es/List.d.ts
+++ b/types/react-virtualized/dist/es/List.d.ts
@@ -72,7 +72,7 @@ export type ListProps = GridCoreProps & {
  *
  * This component renders a virtualized list of elements with either fixed or dynamic heights.
  */
-export class List extends PureComponent<ListProps, {}> {
+export class List extends PureComponent<ListProps> {
     static propTypes: {
         'aria-label': Requireable<string>,
         autoHeight: Requireable<boolean>,
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index af14c8af22..c1216f12b1 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -97,7 +97,7 @@ export type ColumnProps = {
     /** Flex basis (width) for this column; This value can grow or shrink based on :flexGrow and :flexShrink properties. */
     width: number;
 }
-export class Column extends Component<ColumnProps, {}> {
+export class Column extends Component<ColumnProps> {
     static propTypes: {
         'aria-label': Requireable<string>,
         cellDataGetter: Requireable<TableCellDataGetter>,
@@ -318,7 +318,7 @@ export const SortIndicator: React.StatelessComponent<{ sortDirection: SortDirect
  * Table component with fixed headers and virtualized rows for improved performance with large data sets.
  * This component expects explicit width, height, and padding parameters.
  */
-export class Table extends PureComponent<TableProps, {}> {
+export class Table extends PureComponent<TableProps> {
     static propTypes: {
         'aria-label': Requireable<string>,
         autoHeight: Requireable<boolean>,
diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index 54a0d69f92..88445428fa 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -116,7 +116,7 @@ export class AutoSizerExample extends PureComponent<any, any> {
 import { } from 'react'
 import { CellMeasurer, CellMeasurerCache } from 'react-virtualized'
 
-export class DynamicHeightList extends PureComponent<any, any> {
+export class DynamicHeightList extends PureComponent<any> {
 
     _cache: CellMeasurerCache
 
@@ -1157,7 +1157,7 @@ const STYLE_TOP_RIGHT_GRID: React.CSSProperties = {
     fontWeight: 'bold'
 }
 
-export class MultiGridExample extends PureComponent<any, any> {
+export class MultiGridExample extends PureComponent<any> {
     state
     _onFixedColumnCountChange
     _onFixedRowCountChange
@@ -1248,7 +1248,7 @@ const TOP_COLOR_FROM = hexToRgb('#000000')
 const TOP_COLOR_TO = hexToRgb('#333333')
 
 function scrollbarSize() { return 42; }
-export class GridExample3 extends PureComponent<any, any> {
+export class GridExample3 extends PureComponent<any> {
     state
     constructor(props, context) {
         super(props, context)
@@ -1463,7 +1463,7 @@ function mixColors(color1, color2, amount) {
 
 import { Column, Table, SortDirection, SortIndicator } from 'react-virtualized'
 
-export class TableExample extends PureComponent<any, any> {
+export class TableExample extends PureComponent<any> {
     state;
     context;
     constructor(props, context) {
@@ -1658,7 +1658,7 @@ export class TableExample extends PureComponent<any, any> {
 
 import {TableCellProps} from "react-virtualized"
 
-export class DynamicHeightTableColumnExample extends PureComponent<any, any> {
+export class DynamicHeightTableColumnExample extends PureComponent<any> {
     state;
     context;
     _cache: CellMeasurerCache;
@@ -1752,7 +1752,7 @@ export class DynamicHeightTableColumnExample extends PureComponent<any, any> {
     }
 }
 
-export class WindowScrollerExample extends PureComponent<any, any> {
+export class WindowScrollerExample extends PureComponent<any> {
     state;
     context;
     _windowScroller: WindowScroller;
diff --git a/types/react-widgets/react-widgets-tests.tsx b/types/react-widgets/react-widgets-tests.tsx
index 53ee0dd7f8..d0af494394 100644
--- a/types/react-widgets/react-widgets-tests.tsx
+++ b/types/react-widgets/react-widgets-tests.tsx
@@ -11,7 +11,7 @@ function itemComponent(props: { value: string }) {
     return <span>{props.value}</span>;
 }
 
-class Test extends React.Component<React.Props<{}>, {}> {
+class Test extends React.Component<React.Props<{}>> {
     render() {
         return (
         <div>
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 4cbc531417..518b277a6a 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -229,7 +229,7 @@ var componentNoState: ModernComponentNoState =
     ReactDOM.render(elementNoState, container);
 var componentNoStateElementOrNull: ModernComponentNoState =
     ReactDOM.render(elementNoState, document.getElementById("anelement"));
-var classicComponent: React.ClassicComponent<Props, any> =
+var classicComponent: React.ClassicComponent<Props> =
     ReactDOM.render(classicElement, container);
 var domComponent: Element =
     ReactDOM.render(domElement, container);
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 331436760e..7842538c86 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -127,7 +127,7 @@ function AlertExample1() {
 }
 
 // --------------- Badge
-class Example2 extends React.Component<any, any> {
+class Example2 extends React.Component<any> {
   render() {
     return (
       <div>
@@ -142,7 +142,7 @@ class Example2 extends React.Component<any, any> {
   }
 }
 
-export class Example3 extends React.Component<any, any> {
+export class Example3 extends React.Component<any> {
   render() {
     return (
       <div>
@@ -157,7 +157,7 @@ export class Example3 extends React.Component<any, any> {
   }
 }
 
-class Example4 extends React.Component<any, any> {
+class Example4 extends React.Component<any> {
   render() {
     return (
       <div>
@@ -206,7 +206,7 @@ const Example6 = (props: any) => {
 };
 
 // ------------- Buttons
-class Example7 extends React.Component<any, any> {
+class Example7 extends React.Component<any> {
   render() {
     return (
       <div>
@@ -222,7 +222,7 @@ class Example7 extends React.Component<any, any> {
   }
 }
 
-class Example8 extends React.Component<any, any> {
+class Example8 extends React.Component<any> {
   render() {
     return (
       <div>
@@ -422,7 +422,7 @@ const Example19 = (
 );
 
 // --------------- ButtonGroup
-class Example20 extends React.Component<any, any> {
+class Example20 extends React.Component<any> {
   render() {
     return (
       <ButtonGroup>
@@ -434,7 +434,7 @@ class Example20 extends React.Component<any, any> {
   }
 }
 
-class Example21 extends React.Component<any, any> {
+class Example21 extends React.Component<any> {
   render() {
     return (
       <ButtonToolbar>
@@ -1067,7 +1067,7 @@ function Example44() {
 }
 
 // ------------------ Form
-class Example45 extends React.Component<any, any> {
+class Example45 extends React.Component<any> {
   render() {
     return (
       <Form>
@@ -1144,7 +1144,7 @@ class Example45 extends React.Component<any, any> {
   }
 }
 
-class Example46 extends React.Component<any, any> {
+class Example46 extends React.Component<any> {
   render() {
     return (
       <Form>
@@ -1232,7 +1232,7 @@ class Example46 extends React.Component<any, any> {
   }
 }
 
-class Example47 extends React.Component<any, any> {
+class Example47 extends React.Component<any> {
   render() {
     return (
       <Form inline>
@@ -1252,7 +1252,7 @@ class Example47 extends React.Component<any, any> {
   }
 }
 
-class Example48 extends React.Component<any, any> {
+class Example48 extends React.Component<any> {
   render() {
     return (
       <Form>
@@ -1279,7 +1279,7 @@ class Example48 extends React.Component<any, any> {
   }
 }
 
-class Example49 extends React.Component<any, any> {
+class Example49 extends React.Component<any> {
   render() {
     return (
       <Form>
@@ -1372,7 +1372,7 @@ class Example49 extends React.Component<any, any> {
   }
 }
 
-class Example50 extends React.Component<any, any> {
+class Example50 extends React.Component<any> {
   render() {
     return (
       <Form>
@@ -1393,7 +1393,7 @@ class Example50 extends React.Component<any, any> {
   }
 }
 
-class Example51 extends React.Component<any, any> {
+class Example51 extends React.Component<any> {
   render() {
     return (
       <Form inline>
@@ -1609,7 +1609,7 @@ const Example60 = (props: any) => {
   );
 };
 
-class Example61 extends React.Component<any, any> {
+class Example61 extends React.Component<any> {
   render() {
     return (
       <Container>
@@ -1651,7 +1651,7 @@ class Example61 extends React.Component<any, any> {
   }
 }
 
-class Example62 extends React.Component<any, any> {
+class Example62 extends React.Component<any> {
   render() {
     return (
       <ListGroup>
@@ -1665,7 +1665,7 @@ class Example62 extends React.Component<any, any> {
   }
 }
 
-class Example63 extends React.Component<any, any> {
+class Example63 extends React.Component<any> {
   render() {
     return (
       <ListGroup>
@@ -1677,7 +1677,7 @@ class Example63 extends React.Component<any, any> {
   }
 }
 
-class Example64 extends React.Component<any, any> {
+class Example64 extends React.Component<any> {
   render() {
     return (
       <ListGroup>
@@ -1691,7 +1691,7 @@ class Example64 extends React.Component<any, any> {
   }
 }
 
-class Example65 extends React.Component<any, any> {
+class Example65 extends React.Component<any> {
   render() {
     return (
       <div>
@@ -1718,7 +1718,7 @@ class Example65 extends React.Component<any, any> {
   }
 }
 
-class Example66 extends React.Component<any, any> {
+class Example66 extends React.Component<any> {
   render() {
     return (
       <ListGroup>
@@ -1731,7 +1731,7 @@ class Example66 extends React.Component<any, any> {
   }
 }
 
-class Example67 extends React.Component<any, any> {
+class Example67 extends React.Component<any> {
   render() {
     return (
       <ListGroup>
@@ -2156,7 +2156,7 @@ class Example76 extends React.Component<any, any> {
   }
 }
 
-class Example77 extends React.Component<any, any> {
+class Example77 extends React.Component<any> {
   render() {
     return (
       <div>
@@ -2315,7 +2315,7 @@ class Example80 extends React.Component<any, any> {
 }
 
 // ----------- Pagination
-class Example81 extends React.Component<any, any> {
+class Example81 extends React.Component<any> {
   render() {
     return (
       <Pagination>
@@ -2355,7 +2355,7 @@ class Example81 extends React.Component<any, any> {
   }
 }
 
-class Example82 extends React.Component<any, any> {
+class Example82 extends React.Component<any> {
   render() {
     return (
       <Pagination>
@@ -2395,7 +2395,7 @@ class Example82 extends React.Component<any, any> {
   }
 }
 
-class Example83 extends React.Component<any, any> {
+class Example83 extends React.Component<any> {
   render() {
     return (
       <Pagination size="lg">
@@ -2425,7 +2425,7 @@ class Example83 extends React.Component<any, any> {
   }
 }
 
-class Example84 extends React.Component<any, any> {
+class Example84 extends React.Component<any> {
   render() {
     return (
       <Pagination size="sm">
@@ -2700,7 +2700,7 @@ const Example92 = (props: any) => {
 };
 
 // --------------- Table
-class Example93 extends React.Component<any, any> {
+class Example93 extends React.Component<any> {
   render() {
     return (
       <Table>
@@ -2737,7 +2737,7 @@ class Example93 extends React.Component<any, any> {
   }
 }
 
-class Example94 extends React.Component<any, any> {
+class Example94 extends React.Component<any> {
   render() {
     return (
       <Table inverse>
@@ -2774,7 +2774,7 @@ class Example94 extends React.Component<any, any> {
   }
 }
 
-class Example95 extends React.Component<any, any> {
+class Example95 extends React.Component<any> {
   render() {
     return (
       <Table striped>
@@ -2811,7 +2811,7 @@ class Example95 extends React.Component<any, any> {
   }
 }
 
-class Example96 extends React.Component<any, any> {
+class Example96 extends React.Component<any> {
   render() {
     return (
       <Table bordered>
@@ -2848,7 +2848,7 @@ class Example96 extends React.Component<any, any> {
   }
 }
 
-class Example97 extends React.Component<any, any> {
+class Example97 extends React.Component<any> {
   render() {
     return (
       <Table hover>
@@ -2885,7 +2885,7 @@ class Example97 extends React.Component<any, any> {
   }
 }
 
-class Example98 extends React.Component<any, any> {
+class Example98 extends React.Component<any> {
   render() {
     return (
       <Table size="sm">
@@ -2922,7 +2922,7 @@ class Example98 extends React.Component<any, any> {
   }
 }
 
-class Example99 extends React.Component<any, any> {
+class Example99 extends React.Component<any> {
   render() {
     return (
       <Table responsive>
@@ -2971,7 +2971,7 @@ class Example99 extends React.Component<any, any> {
   }
 }
 
-class Example100 extends React.Component<any, any> {
+class Example100 extends React.Component<any> {
   render() {
     return (
       <Table responsive>
diff --git a/types/rebass/rebass-tests.tsx b/types/rebass/rebass-tests.tsx
index 2d20c900db..257b066cee 100644
--- a/types/rebass/rebass-tests.tsx
+++ b/types/rebass/rebass-tests.tsx
@@ -67,13 +67,13 @@ interface IconProps extends React.Props<Icon> {
   width: string;
 }
 
-class Icon extends React.Component<IconProps, {}> {
+class Icon extends React.Component<IconProps> {
   render() {
     return <div></div>;
   }
 }
 
-class RebassTest extends React.Component<{}, {}> {
+class RebassTest extends React.Component<{}> {
   render() {
     return <div>
       <Button
diff --git a/types/redux-devtools-dock-monitor/index.d.ts b/types/redux-devtools-dock-monitor/index.d.ts
index 708077f5a8..66461cecf5 100644
--- a/types/redux-devtools-dock-monitor/index.d.ts
+++ b/types/redux-devtools-dock-monitor/index.d.ts
@@ -66,4 +66,4 @@ interface IDockMonitorProps {
     defaultIsVisible?: boolean
 }
 
-export default class DockMonitor extends React.Component<IDockMonitorProps, any> { }
+export default class DockMonitor extends React.Component<IDockMonitorProps> { }
diff --git a/types/redux-devtools-log-monitor/index.d.ts b/types/redux-devtools-log-monitor/index.d.ts
index e51af01d34..d3cc1b25a6 100644
--- a/types/redux-devtools-log-monitor/index.d.ts
+++ b/types/redux-devtools-log-monitor/index.d.ts
@@ -48,4 +48,4 @@ interface ILogMonitorProps {
     expandStateRoot?: boolean
 }
 
-export default class LogMonitor extends React.Component<ILogMonitorProps, any> { }
+export default class LogMonitor extends React.Component<ILogMonitorProps> { }
diff --git a/types/redux-devtools/redux-devtools-tests.tsx b/types/redux-devtools/redux-devtools-tests.tsx
index 695fbe60ff..e0d4d56411 100644
--- a/types/redux-devtools/redux-devtools-tests.tsx
+++ b/types/redux-devtools/redux-devtools-tests.tsx
@@ -5,7 +5,7 @@ import { createDevTools, persistState } from 'redux-devtools'
 
 declare var reducer: Reducer<any>
 
-class DevToolsMonitor extends React.Component<any, any> {
+class DevToolsMonitor extends React.Component<any> {
 }
 
 const DevTools = createDevTools(
@@ -19,7 +19,7 @@ const finalCreateStore = compose(
 
 const store: Store<any> = finalCreateStore(reducer)
 
-class App extends React.Component<any, any> {
+class App extends React.Component<any> {
   render() {
     return (
       <Provider store={store}>
diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index 3409c47842..d2439d87a6 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -101,7 +101,7 @@ export type Validator = (value: FieldValue, allValues?: any, props?: any) => any
 /**
  * Declare Field as this interface to specify the generic.
  */
-export interface GenericField<FieldCustomProps, S> extends Component<BaseFieldProps & FieldCustomProps, {}> {
+export interface GenericField<FieldCustomProps, S> extends Component<BaseFieldProps & FieldCustomProps> {
     /**
      * true if the current value is different from the initialized value,
      * false otherwise.
@@ -129,13 +129,13 @@ export interface GenericField<FieldCustomProps, S> extends Component<BaseFieldPr
      * provide a withRef prop, and your component must not be a stateless function
      * component.
      */
-    getRenderedComponent(): Component<WrappedFieldProps<S> & FieldCustomProps, any>;
+    getRenderedComponent(): Component<WrappedFieldProps<S> & FieldCustomProps>;
 }
 
 /**
  * The Field Instance API.
  */
-export class Field extends Component<any, {}> implements GenericField<any, any> {
+export class Field extends Component<any> implements GenericField<any, any> {
     /**
      * true if the current value is different from the initialized value,
      * false otherwise.
@@ -163,7 +163,7 @@ export class Field extends Component<any, {}> implements GenericField<any, any>
      * provide a withRef prop, and your component must not be a stateless function
      * component.
      */
-    getRenderedComponent(): Component<any, any>;
+    getRenderedComponent(): Component<any>;
 }
 
 /**
diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index a2f2f827cd..9629eecb27 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -51,7 +51,7 @@ interface BaseFieldArrayProps {
 /**
  * Declare FieldArray as this interface to specify the generics.
  */
-export interface GenericFieldArray<T, FieldCustomProps> extends Component<BaseFieldArrayProps & FieldCustomProps, {}> {
+export interface GenericFieldArray<T, FieldCustomProps> extends Component<BaseFieldArrayProps & FieldCustomProps> {
 
     /**
      * The name prop that you passed in.
@@ -68,13 +68,13 @@ export interface GenericFieldArray<T, FieldCustomProps> extends Component<BaseFi
      * provide a withRef prop, and your component must not be a stateless function
      * component.
      */
-    getRenderedComponent(): Component<WrappedFieldArrayProps<T> & FieldCustomProps, any>;
+    getRenderedComponent(): Component<WrappedFieldArrayProps<T> & FieldCustomProps>;
 }
 
 /**
  * The FieldArray Instance API.
  */
-export class FieldArray extends Component<any, {}> implements GenericFieldArray<any, any> {
+export class FieldArray extends Component<any> implements GenericFieldArray<any, any> {
 
     /**
      * The name prop that you passed in.
@@ -91,7 +91,7 @@ export class FieldArray extends Component<any, {}> implements GenericFieldArray<
      * provide a withRef prop, and your component must not be a stateless function
      * component.
      */
-    getRenderedComponent(): Component<any, any>;
+    getRenderedComponent(): Component<any>;
 }
 
 /**
diff --git a/types/redux-form/lib/Fields.d.ts b/types/redux-form/lib/Fields.d.ts
index d6548aeb6f..b2c210ba8c 100644
--- a/types/redux-form/lib/Fields.d.ts
+++ b/types/redux-form/lib/Fields.d.ts
@@ -56,7 +56,7 @@ interface BaseFieldsProps {
 /**
  * Declare Fields as this interface to specify the generics.
  */
-export interface GenericFields<T, FieldsCustomProps> extends Component<BaseFieldsProps & FieldsCustomProps, {}> {
+export interface GenericFields<T, FieldsCustomProps> extends Component<BaseFieldsProps & FieldsCustomProps> {
     /**
      * true if the current value of any of the fields is different from the initialized value, false otherwise.
      */
@@ -79,13 +79,13 @@ export interface GenericFields<T, FieldsCustomProps> extends Component<BaseField
      */
     values: { [name: string]: FieldValue };
 
-    getRenderedComponent(): Component<BaseFieldsProps & FieldsCustomProps, any>;
+    getRenderedComponent(): Component<BaseFieldsProps & FieldsCustomProps>;
 }
 
 /**
  * The Fields Instance API.
  */
-export class Fields extends Component<any, {}> implements GenericFields<any, any> {
+export class Fields extends Component<any> implements GenericFields<any, any> {
     /**
      * true if the current value of any of the fields is different from the initialized value, false otherwise.
      */
@@ -108,7 +108,7 @@ export class Fields extends Component<any, {}> implements GenericFields<any, any
      */
     values: { [name: string]: FieldValue };
 
-    getRenderedComponent(): Component<any, any>;
+    getRenderedComponent(): Component<any>;
 }
 
 interface WrappedFieldsProps<S> {
diff --git a/types/redux-form/lib/Form.d.ts b/types/redux-form/lib/Form.d.ts
index 062be3e1bf..9339348393 100644
--- a/types/redux-form/lib/Form.d.ts
+++ b/types/redux-form/lib/Form.d.ts
@@ -19,4 +19,4 @@ export interface FormComponentProps extends HTMLProps<HTMLFormElement> {
  * allows the surrounding redux-form-decorated component to trigger its
  * onSubmit function.
  */
-export class Form extends Component<FormComponentProps, any> {}
+export class Form extends Component<FormComponentProps> {}
diff --git a/types/redux-form/lib/FormSection.d.ts b/types/redux-form/lib/FormSection.d.ts
index 9ed6c0c9b7..9be46ebf80 100644
--- a/types/redux-form/lib/FormSection.d.ts
+++ b/types/redux-form/lib/FormSection.d.ts
@@ -12,4 +12,4 @@ interface FormSectionProps {
  * multiple forms. It does this by prefixing the name of Field, Fields and FieldArray children, at any depth,
  * with the value specified in the name prop.
  */
-export class FormSection extends Component<FormSectionProps, any> {}
+export class FormSection extends Component<FormSectionProps> {}
diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 7615824b53..64c21ed9d8 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -6,7 +6,7 @@ interface CustomComponentProps {
     customProp: string;
 }
 
-class CustomComponent extends Component<WrappedFieldProps<any> & CustomComponentProps, {}> {
+class CustomComponent extends Component<WrappedFieldProps<any> & CustomComponentProps> {
     render() {
         const {
             input,
@@ -24,7 +24,7 @@ class CustomComponent extends Component<WrappedFieldProps<any> & CustomComponent
     }
 }
 
-class CustomField extends Component<BaseFieldProps & CustomComponentProps, {}> {
+class CustomField extends Component<BaseFieldProps & CustomComponentProps> {
     render() {
         const F = Field as new () => GenericField<CustomComponentProps, any>;
         return <F component={CustomComponent} {...this.props} />;
@@ -39,7 +39,7 @@ interface FormData {
 @reduxForm<FormData, any, any>({
     form: 'myForm'
 })
-class MyForm extends Component<any, any> {
+class MyForm extends Component<any> {
     render() {
         return (
             <div>
@@ -125,7 +125,7 @@ const ConnectedDecoratedInitializeFromStateFormFunction = connect(
 
 // React ComponentClass instead of StatelessComponent
 
-class InitializeFromStateFormClass extends React.Component<Props & DispatchProp<any>, {}> {
+class InitializeFromStateFormClass extends React.Component<Props & DispatchProp<any>> {
     render() {
         return InitializeFromStateFormFunction(this.props);
     }
diff --git a/types/redux-form/v4/index.d.ts b/types/redux-form/v4/index.d.ts
index b23b05d5c2..7fecf00579 100644
--- a/types/redux-form/v4/index.d.ts
+++ b/types/redux-form/v4/index.d.ts
@@ -272,7 +272,7 @@ export interface ReduxFormProps<T> {
     values?: FormData;
 }
 
-declare class ElementClass extends Component<any, any> {
+declare class ElementClass extends Component<any> {
 }
 interface ClassDecorator {
     <T extends (typeof ElementClass)>(component: T): T;
diff --git a/types/redux-form/v4/redux-form-tests.tsx b/types/redux-form/v4/redux-form-tests.tsx
index 8254caabbf..2c962460fa 100644
--- a/types/redux-form/v4/redux-form-tests.tsx
+++ b/types/redux-form/v4/redux-form-tests.tsx
@@ -8,7 +8,7 @@ import {reduxForm, reducer as reduxFormReducer, ReduxFormProps} from 'redux-form
 namespace SimpleForm {
   export const fields = ['firstName', 'lastName', 'email', 'sex', 'favoriteColor', 'employed', 'notes'];
 
-  class SimpleForm extends Component<ReduxFormProps<SimpleForm & HTMLFormElement>, void> {
+  class SimpleForm extends Component<ReduxFormProps<SimpleForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -123,7 +123,7 @@ namespace SynchronousValidation {
     return errors;
   };
 
-  class SynchronousValidationForm extends Component<ReduxFormProps<SynchronousValidationForm & HTMLFormElement>, any> {
+  class SynchronousValidationForm extends Component<ReduxFormProps<SynchronousValidationForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -193,7 +193,7 @@ namespace SumbitValidation {
     });
   };
 
-  class SubmitValidationForm extends Component<ReduxFormProps<SubmitValidationForm>, any> {
+  class SubmitValidationForm extends Component<ReduxFormProps<SubmitValidationForm>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -255,7 +255,7 @@ namespace InitializingFromState {
     load: Function;
   }
 
-  class InitializingFromStateForm extends Component<Props<InitializingFromStateForm & HTMLFormElement>, any> {
+  class InitializingFromStateForm extends Component<Props<InitializingFromStateForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
diff --git a/types/redux-infinite-scroll/index.d.ts b/types/redux-infinite-scroll/index.d.ts
index 1f621ec8e4..5ce0f552d9 100644
--- a/types/redux-infinite-scroll/index.d.ts
+++ b/types/redux-infinite-scroll/index.d.ts
@@ -20,6 +20,6 @@ interface InfiniteScrollerProps {
     holderType?: string;
 }
 
-declare class InfiniteScoller extends Component<InfiniteScrollerProps & HTMLProps<HTMLDivElement>, {}> {}
+declare class InfiniteScoller extends Component<InfiniteScrollerProps & HTMLProps<HTMLDivElement>> {}
 
 export default InfiniteScoller;
diff --git a/types/redux-infinite-scroll/redux-infinite-scroll-tests.tsx b/types/redux-infinite-scroll/redux-infinite-scroll-tests.tsx
index b092c9a42d..271e866fe5 100644
--- a/types/redux-infinite-scroll/redux-infinite-scroll-tests.tsx
+++ b/types/redux-infinite-scroll/redux-infinite-scroll-tests.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import InfiniteScoller from "redux-infinite-scroll";
 
-class App extends React.Component<any, any> {
+class App extends React.Component<any> {
     state = {
         numOfItems: 40,
         loadingMore: false
diff --git a/types/redux-ui/redux-ui-tests.ts b/types/redux-ui/redux-ui-tests.ts
index 049c807af7..487a376f97 100644
--- a/types/redux-ui/redux-ui-tests.ts
+++ b/types/redux-ui/redux-ui-tests.ts
@@ -15,7 +15,7 @@ interface UIShape {
   mergeProps: () => ({}),
   options: {}
 })
-class Root extends React.Component<ReduxUIProps<UIShape>, {}> {
+class Root extends React.Component<ReduxUIProps<UIShape>> {
   componentWillMount() {
     console.info(
       this.props.ui.s,
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
index d3d6a287b4..6a56baf3fc 100644
--- a/types/rrc/index.d.ts
+++ b/types/rrc/index.d.ts
@@ -13,7 +13,7 @@ export interface ScrollIntoViewProps {
     id: string;
 }
 
-export class ScrollIntoView extends React.Component<ScrollIntoViewProps, void> { }
+export class ScrollIntoView extends React.Component<ScrollIntoViewProps> { }
 
 export type PropIdCallback = () => string;
 
@@ -34,7 +34,7 @@ export interface SwitchProps {
     location: H.LocationDescriptorObject & { pathname: H.Pathname };
 }
 
-export class ConfigSwitch extends React.Component<SwitchProps, void> { }
+export class ConfigSwitch extends React.Component<SwitchProps> { }
 
 export type OnUpdateCall = (location: H.Location) => void;
 
@@ -43,7 +43,7 @@ export interface OnUpdateProps {
     immediate?: boolean;
 }
 
-export class OnUpdate extends React.Component<OnUpdateProps, {}> { }
+export class OnUpdate extends React.Component<OnUpdateProps> { }
 
 export type IsActiveCallback = () => boolean;
 
@@ -64,7 +64,7 @@ export interface StatusProps {
     code: string;
 }
 
-export class Status extends React.Component<StatusProps, void> { }
+export class Status extends React.Component<StatusProps> { }
 
 export type GetKeyFunction<Params> = (match: MatchObject<Params>, route: RouteConfiguration, location: H.Location) => string;
 
diff --git a/types/rrc/rrc-tests.tsx b/types/rrc/rrc-tests.tsx
index 084f921614..5356cb21a6 100644
--- a/types/rrc/rrc-tests.tsx
+++ b/types/rrc/rrc-tests.tsx
@@ -13,7 +13,7 @@ import {
     OnUpdateCall
 } from "rrc";
 
-class RouteOne extends React.Component<RouteComponentProps<{}>, {}> {
+class RouteOne extends React.Component<RouteComponentProps<{}>> {
     render() {
         return <div>
             <ConfigSwitch location={this.props.location} routes={[
@@ -29,7 +29,7 @@ class RouteOne extends React.Component<RouteComponentProps<{}>, {}> {
     }
 }
 
-class RouteTwo extends React.Component<RouteComponentProps<{}>, {}> {
+class RouteTwo extends React.Component<RouteComponentProps<{}>> {
     private onUpdate: OnUpdateCall = (location) => { console.log("update"); };
 
     render() {
@@ -46,7 +46,7 @@ interface LayoutProps {
     subtitle?: string;
 }
 
-class Layout extends React.Component<LayoutProps, {}> {
+class Layout extends React.Component<LayoutProps> {
     render() {
         return <div>
             <div>{`Layout ${this.props.title}`}</div>
@@ -64,7 +64,7 @@ interface Params {
     page: number;
 }
 
-class RouteFour extends React.Component<RouteComponentProps<{}>, {}> {
+class RouteFour extends React.Component<RouteComponentProps<{}>> {
     private routes: RouteConfiguration[] = [
         { path: "/four/something/:page", component: RouteTwo }
     ];
@@ -95,7 +95,7 @@ interface MyContainerProps {
     color: number;
 }
 
-class MyContainer extends React.Component<MyContainerProps, {}> {
+class MyContainer extends React.Component<MyContainerProps> {
     render() {
         return <div className={this.props.className}>
             {this.props.children}
diff --git a/types/spectacle/index.d.ts b/types/spectacle/index.d.ts
index a4253efef3..12716fb32c 100644
--- a/types/spectacle/index.d.ts
+++ b/types/spectacle/index.d.ts
@@ -100,51 +100,51 @@ declare module "spectacle" {
 		lineHeight?:number
 	}
 
-	export class Spectacle extends React.Component<SpectacleProps, any> {}
+	export class Spectacle extends React.Component<SpectacleProps> {}
 
-	export class Deck extends React.Component<DeckProps, any> {}
+	export class Deck extends React.Component<DeckProps> {}
 
-	export class Slide extends React.Component<SlideProps, any> {}
+	export class Slide extends React.Component<SlideProps> {}
 
-	export class Layout extends React.Component<any, any> {}
+	export class Layout extends React.Component<any> {}
 
-	export class Fit extends React.Component<any, any> {}
+	export class Fit extends React.Component<any> {}
 
-	export class Fill extends React.Component<any, any> {}
+	export class Fill extends React.Component<any> {}
 
-	export class Markdown extends React.Component<MarkdownProps, any> {}
+	export class Markdown extends React.Component<MarkdownProps> {}
 
-	export class Appear extends React.Component<any, any> {}
+	export class Appear extends React.Component<any> {}
 
-	export class BlockQuote extends React.Component<BaseProps, any> {}
+	export class BlockQuote extends React.Component<BaseProps> {}
 
-	export class Quote extends React.Component<BaseProps, any> {}
+	export class Quote extends React.Component<BaseProps> {}
 
-	export class Cite extends React.Component<BaseProps, any> {}
+	export class Cite extends React.Component<BaseProps> {}
 
-	export class CodePane extends React.Component<CodePaneProps, any> {}
+	export class CodePane extends React.Component<CodePaneProps> {}
 
-	export class Code extends React.Component<BaseProps, any> {}
+	export class Code extends React.Component<BaseProps> {}
 
-	export class Heading extends React.Component<HeadingProps, any> {}
+	export class Heading extends React.Component<HeadingProps> {}
 
-	export class Image extends React.Component<ImageProps, any> {}
+	export class Image extends React.Component<ImageProps> {}
 
-	export class Link extends React.Component<LinkProps, any> {}
+	export class Link extends React.Component<LinkProps> {}
 
-	export class List extends React.Component<BaseProps, any> {}
+	export class List extends React.Component<BaseProps> {}
 
-	export class ListItem extends React.Component<BaseProps, any> {}
+	export class ListItem extends React.Component<BaseProps> {}
 
-	export class S extends React.Component<SProps, any> {}
+	export class S extends React.Component<SProps> {}
 
-	export class Table extends React.Component<BaseProps, any> {}
+	export class Table extends React.Component<BaseProps> {}
 
-	export class TableRow extends React.Component<BaseProps, any> {}
+	export class TableRow extends React.Component<BaseProps> {}
 
-	export class TableHeaderItem extends React.Component<BaseProps, any> {}
+	export class TableHeaderItem extends React.Component<BaseProps> {}
 
-	export class TableItem extends React.Component<BaseProps, any> {}
+	export class TableItem extends React.Component<BaseProps> {}
 
-	export class Text extends React.Component<TextProps, any> {}
+	export class Text extends React.Component<TextProps> {}
 }
\ No newline at end of file
diff --git a/types/spectacle/spectacle-tests.tsx b/types/spectacle/spectacle-tests.tsx
index 5f0c959a50..ad5a2fd8ea 100644
--- a/types/spectacle/spectacle-tests.tsx
+++ b/types/spectacle/spectacle-tests.tsx
@@ -21,7 +21,7 @@ import {
 	Text
 } from "spectacle";
 
-export class SpectacleTest extends React.Component<any, any> {
+export class SpectacleTest extends React.Component<any> {
 	callback() {
 		alert('Callback: ' + JSON.stringify(arguments));
 	}
diff --git a/types/storybook__react/index.d.ts b/types/storybook__react/index.d.ts
index 6a29b176b0..501c3cb947 100644
--- a/types/storybook__react/index.d.ts
+++ b/types/storybook__react/index.d.ts
@@ -14,7 +14,7 @@
 declare module '@storybook/react' {
     import * as React from 'react';
 
-    type Renderable = React.StatelessComponent<any> | React.Component<any, any> | JSX.Element;
+    type Renderable = React.StatelessComponent<any> | React.Component<any> | JSX.Element;
     type RenderFunction = () => Renderable;
 
     type StoryDecorator = (story: RenderFunction, context: { kind: string, story: string }) => Renderable | null;
diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index 25509b3d0f..8e0bee498f 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -78,7 +78,7 @@ declare module "victory" {
      * VictoryAnimation animates prop changes for any React component.
      * Just use a child function inside VictoryAnimation that accepts an object of tweened values and returns a component to render.
      */
-    export class VictoryAnimation extends React.Component<VictoryAnimationProps, any> {}
+    export class VictoryAnimation extends React.Component<VictoryAnimationProps> {}
 
     /**
      * Text anchor type
@@ -172,7 +172,7 @@ declare module "victory" {
     /**
      * VictoryLabel is a text component that provides several enhancements over SVG’s <text> element.
      */
-    export class VictoryLabel extends React.Component<VictoryLabelProps, any> {}
+    export class VictoryLabel extends React.Component<VictoryLabelProps> {}
 
     export interface VictoryContainerProps {
         /**
@@ -224,7 +224,7 @@ declare module "victory" {
          */
         desc?: string;
     }
-    export class VictoryContainer extends React.Component<VictoryContainerProps, any> {}
+    export class VictoryContainer extends React.Component<VictoryContainerProps> {}
 
     // Note: Many SVG attributes are missed in CSSProperties interface
     export interface VictoryThemeDefinition {
@@ -666,7 +666,7 @@ declare module "victory" {
      * Draw area charts with React. VictoryArea is a composable component, so it doesn't include axes.
      * Add VictoryArea as a child of VictoryChart for a complete chart.
      */
-    export class VictoryArea extends React.Component<VictoryAreaProps, any> {}
+    export class VictoryArea extends React.Component<VictoryAreaProps> {}
 
     export interface VictoryAxisProps extends VictoryCommonProps {
         /**
@@ -850,7 +850,7 @@ declare module "victory" {
      * Styles and data can be customized by passing in your own values as properties to the component.
      * Data changes are animated with VictoryAnimation.
      */
-    export class VictoryAxis extends React.Component<VictoryAxisProps, any> {}
+    export class VictoryAxis extends React.Component<VictoryAxisProps> {}
 
     export interface VictoryBarProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
         /**
@@ -921,7 +921,7 @@ declare module "victory" {
      * Draw SVG bar charts with React. VictoryBar is a composable component, so it doesn't include axes
      * Check out VictoryChart for complete bar charts and more.
      */
-    export class VictoryBar extends React.Component<VictoryBarProps, any> {}
+    export class VictoryBar extends React.Component<VictoryBarProps> {}
 
     export interface VictoryChartProps extends VictoryCommonProps {
         /**
@@ -1007,7 +1007,7 @@ declare module "victory" {
      * - VictoryScatter
      * - VictoryBar
      */
-    export class VictoryChart extends React.Component<VictoryChartProps, any> {}
+    export class VictoryChart extends React.Component<VictoryChartProps> {}
 
     export interface VictoryGroupProps extends VictoryCommonProps, VictoryMultiLabeableProps {
         /**
@@ -1104,7 +1104,7 @@ declare module "victory" {
          */
         style?: VictoryStyleInterface;
     }
-    export class VictoryGroup extends React.Component<VictoryGroupProps, any> {}
+    export class VictoryGroup extends React.Component<VictoryGroupProps> {}
 
     export interface VictoryLineProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
         /**
@@ -1171,7 +1171,7 @@ declare module "victory" {
      * VictoryLine creates a line based on data. VictoryLine is a composable component, so it does not include an axis.
      * Check out VictoryChart for easy to use line charts and more.
      */
-    export class VictoryLine extends React.Component<VictoryLineProps, any> {}
+    export class VictoryLine extends React.Component<VictoryLineProps> {}
 
     type ScatterSymbolType = "circle" | "diamond" | "plus" | "square" | "star" | "triangleDown" | "triangleUp";
     export interface VictoryScatterProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
@@ -1259,7 +1259,7 @@ declare module "victory" {
      * VictoryScatter creates a scatter of points from data. VictoryScatter is a composable component, so it does not include an axis.
      * Check out VictoryChart for easy to use scatter plots and more.
      */
-    export class VictoryScatter extends React.Component<VictoryScatterProps, any> {}
+    export class VictoryScatter extends React.Component<VictoryScatterProps> {}
 
     export interface VictoryStackProps extends VictoryCommonProps, VictoryMultiLabeableProps {
         /**
@@ -1361,7 +1361,7 @@ declare module "victory" {
          */
         xOffset?: number;
     }
-    export class VictoryStack extends React.Component<VictoryStackProps, any> {}
+    export class VictoryStack extends React.Component<VictoryStackProps> {}
 
     export interface VictoryPieProps extends VictoryCommonProps, VictoryMultiLabeableProps {
         /**
@@ -1505,5 +1505,5 @@ declare module "victory" {
      * Styles and data can be customized by passing in your own values as properties to the component.
      * Data changes are animated with VictoryAnimation.
      */
-    export class VictoryPie extends React.Component<VictoryPieProps, any> {}
+    export class VictoryPie extends React.Component<VictoryPieProps> {}
 }