commenting some code for deletion in 2.0, refs #16585 !strict.