Remove unused code
Add component test