more cleanup pursuant to [#77684054]