code cleanup / negin of readding Windows support