Re #7855 Remove commented code