Cleanup components

[PatelUtkarsh]

Summary

Fixes #

Checklist

• [ ] My pull request is addressing an open issue (please create one otherwise).
• [ ] My code is tested and passes existing tests.
• [ ] My code follows the Contributing Guidelines (updates are often made to the guidelines, check it out periodically).

[coveralls]

Pull Request Test Coverage Report for Build 2937942457

• 0 of 0 changed or added relevant lines in 0 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 70.737%

---

Totals
Change from base Build 2937888152:	0.0%
Covered Lines:	4664
Relevant Lines:	6447

---

💛 - Coveralls