Forgot to clean up nsm.* in previous commit