Re #8735 Only headers and no functional code.
Re #8717 Cleanup commented code.