Refactor NND module, removing stray echos and simplifying logic.