Remove mac bits

And some windows leftovers.