Fixed the Linux variant and cleant some stuff.