Re #7240 Remove unused code