ntk-console: Additional cleanup, no functional change