hoegaarden Merge pull request #46 from vmware-tanzu/horlh/cleanup