[Resolution] Remove now-redundant codepaths