No need to nil out orphanedIcons, as it is not longer a global
Updated for release (v1.8.1)