Update with new components. Remove unused ones (at least for now)