Merge pull request #8589 from daverodgman/ct-unused

Remove unused/non-compiling code