Removing components that are no longer appropriate for the template
library