Refs #9568. Uncomment accidentally commented clean-up code