Got rid of some old code I'm not using any more
NSP scoring working a bit better