You could give this 3rd party tool a try… probably best to remove the entries from your registry before starting this.