diff --git a/functions/gecos.pp b/functions/gecos.pp
deleted file mode 100644
index d1bf59839defe2438445ed2bcce1834fe7f5a02a..0000000000000000000000000000000000000000
--- a/functions/gecos.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Handle GECOS (passwd comment field)
-# https://en.wikipedia.org/wiki/Gecos_field
-function gecos(
-  Hash[String,String,0,5] $hash = {}
-) {
-  $default_hash = {
-    'name'   => '',
-    'room'   => '',
-    'phone1' => '',
-    'phone2' => '',
-    'mail'   => '',
-  }
-  $rh = $default_host + $hash
-  join([
-    $rh['name'],
-    $rh['room'],
-    $rh['phone1'],
-    $rh['phone2'],
-    $rh['mail'],
-  ], ',')
-}
diff --git a/modules/baseinstall/manifests/init.pp b/modules/baseinstall/manifests/init.pp
index 8164bf7221f10dbdf6c5414c8df383ee168e913d..b3bcb751f353c625c2812c98e9e4ae06e236089f 100644
--- a/modules/baseinstall/manifests/init.pp
+++ b/modules/baseinstall/manifests/init.pp
@@ -41,11 +41,7 @@ class baseinstall {
 
   user { 'lysroot':
     ensure     => 'present',
-    comment    => gecos({
-      name => 'Lysator admin account',
-      room => '~',
-      mail => 'root@lysator.liu.se',
-    }),
+    comment    => 'Lysator admin account,~,,,root@lysator.liu.se',
     membership => 'minimum',
     groups     => [
       'sudo',