Prototype of new SPR move seems to pass tests now
Clean up new SPR code
Clean up various other comments created during debugging