Removing windows code from master