Removing unused component
Merge branch 'master' into docgeneration

* master:
  Removing unused component