Stripped NXCS stuff. Fixed up XCSR