Clean up code left over in 6b530e1211d118c903a1785de72c9262d9d4bcc8, refs #1227