diff --git a/machines/cray/configuration.nix b/machines/cray/configuration.nix
index 5d0905e..9467352 100644
--- a/machines/cray/configuration.nix
+++ b/machines/cray/configuration.nix
@@ -60,14 +60,6 @@ in
   services.printing.enable = true;
   services.printing.drivers = with pkgs; [ splix ];
 
-
-  programs.steam.enable = true;
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "steam"
-    "steam-original"
-    "steam-runtime"
-  ];
-
   # List packages installed in system profile. To search, run:
   environment.systemPackages = with pkgs; [ vim wget curl git ];
 
diff --git a/modules/steam.nix b/modules/steam.nix
index eaf92f7..c3f055e 100644
--- a/modules/steam.nix
+++ b/modules/steam.nix
@@ -1,9 +1,4 @@
 {lib, ...}: {
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "steam"
-    "steam-original"
-    "steam-runtime"
-  ];
   programs.steam.enable = true;
 }
 
diff --git a/modules/via.nix b/modules/via.nix
index d416379..ef292b0 100644
--- a/modules/via.nix
+++ b/modules/via.nix
@@ -1,9 +1,4 @@
-{pkgs,lib, ...}:{
-
-  # Allow via to be used ( it has an unfree license )
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "via" ];
-
-  # Load udev Rules for via
-  services.udev.packages = [ pkgs.via ];
-
+{config, pkgs,lib, ...}:{
+    # Load udev Rules for via
+    services.udev.packages = [ pkgs.via ];
 }
diff --git a/roles/all.nix b/roles/all.nix
index fa7f99f..0f2b414 100644
--- a/roles/all.nix
+++ b/roles/all.nix
@@ -10,23 +10,18 @@
     ../modules/sound.nix
     ../modules/ssh.nix
     ../modules/steam.nix
-    # ../modules/via.nix broken
+    ../modules/via.nix
     ../modules/virtualbox.nix
     ../modules/borgbackup.nix
     #../secrets/remote-builder.nix
     ../users/fleaz.nix
   ];
 
+  # needed for Steam and VIA
+  nixpkgs.config.allowUnfree = true;
+
   # GTK settings stuff for e.g. themes
   programs.dconf.enable = true;
 
-
-  # Temporary hacks that don't deserve their own module
-
-  networking.extraHosts =
-    ''
-      10.10.37.2 bart2.fleaz.me
-    '';
-
 }