Revert "adding more components"

This reverts commit 91096b30bd6bdc1bf0ada72ea33a43599128751c.