ndt code clean up, nothing fixed