Fix removal bug.
Only search the catalog on new component types.
Merge branch 'develop'  Critical uninstall Template fixes attached.