Re #7240 remove unused code