Removed Windows and Linux only variables

Now we are only awaiting the results of the Mac OS X test...