Refs #17190; Cleaned up some old code