diff --git a/src/interval.rs b/src/interval.rs
index 871cea3..e3c91de 100644
--- a/src/interval.rs
+++ b/src/interval.rs
@@ -42,25 +42,17 @@ impl Unit
     }
     #[cfg(not(nightly))]
     fn multiplier(&self) -> u64 {
-	use lazy_static::lazy_static;
-	use std::collections::HashMap;
-
-	
-	fn calc_table(&self) -> {
-	    use Unit::*;
-	    match self {
-		Second => 1000,
-		Minute => Second.multiplier() * 60,
-		Hour => Minute.multiplier() * 60,
-		Day => Hour.multiplier() * 24,
-		Week => Day.multiplier() * 7,
-		Year => Week.multiplier() * 52,
-		Aeon => Year.multiplier() * 1000000,
-	    }
+	match self {
+	    Second => 1000,
+	    Minute => Second.multiplier() * 60,
+	    Hour => Minute.multiplier() * 60,
+	    Day => Hour.multiplier() * 24,
+	    Week => Day.multiplier() * 7,
+	    Year => Week.multiplier() * 52,
+	    Aeon => Year.multiplier() * 1000000,
 	}
-	
-	*MUL_TABLE.get(&self).unwrap()
     }
+    
 }
 
 /// A time object parsed from the definition file.
diff --git a/src/sys/mod.rs b/src/sys/mod.rs
index c5d584a..8882a03 100644
--- a/src/sys/mod.rs
+++ b/src/sys/mod.rs
@@ -1,2 +1,3 @@
 use super::*;
 
+pub mod user;
diff --git a/src/sys/user.rs b/src/sys/user.rs
new file mode 100644
index 0000000..ea43067
--- /dev/null
+++ b/src/sys/user.rs
@@ -0,0 +1 @@
+//! passwd queries