Remove components
Fix bug #1