HCSVLAB-565 Remove breaking redundant code