This is code I moved to the bottom of the file, because I don't think it's used any more. I'd like to investigate if this is true then as a separate PR, remove it.