Refs #5992 Drop old code