Remove some components by just merging them into the templates of their parents
draft
2021-01-25, Gary Kramlich