Yeah it looks like all of those codes(even p1899) reference the nss. Once you fix what they "modified" you should be good.