removed unneeded stuff, at least with moddern msvc compiler