Made the removal of junk hive names not fail when the junk is not present

Change-Id: Ic9eb6211f15d8ea3667ae13f5f14bdcfb371ccf0