Cleanup any component for issue #10
Cleanup expected component for issue #10