Clean up code left over in 7aae5dc8dd8c04f08ec3b87b00731f3e3a9c7306, refs #1137