remove orphaned code used in NR5
fix some unit tests