[TargetInstaller] Minor clean up