further cleanup, #13199