remove some unnecessary bloat from nonstd.h