clean up w32 build w/r/t unused references