lc-irv-1943 cleanup