Software Deployment

Installing Office 2010.  Adding company information into the registry (HKLM\Software) with OCT but the entries are not removed when uninstalled.  According to Microsoft's OCT reference:

Note:
If the user removes, repairs, or reinstalls Office, the custom registry entries are removed or reinstalled with Office.

This is not the case.  Something so simple has caused so much overhead to remove these registry entries.  The best solution I have come up with is to modify the cached .msi to remove the registry key on uninstallation.  The solution works but the OCT should perform as advertised.  Scenario exists in both 32bit & 64bit of Office Professional 2010.

Anybody run into this and have a solution? 

FYI: the key is used with SCCM for inventory