Remove expiry logic, this needs to be redone

cli_test.go

@@ -13,15 +13,14 @@ func (s *Suite) TestRegisterMachine(c *check.C) {
 	now := time.Now().UTC()
 
 	machine := Machine{
-		ID:              0,
-		MachineKey:      "8ce002a935f8c394e55e78fbbb410576575ff8ec5cfa2e627e4b807f1be15b0e",
-		NodeKey:         "bar",
-		DiscoKey:        "faa",
-		Name:            "testmachine",
-		NamespaceID:     namespace.ID,
-		IPAddress:       "10.0.0.1",
-		Expiry:          &now,
-		RequestedExpiry: &now,
+		ID:          0,
+		MachineKey:  "8ce002a935f8c394e55e78fbbb410576575ff8ec5cfa2e627e4b807f1be15b0e",
+		NodeKey:     "bar",
+		DiscoKey:    "faa",
+		Name:        "testmachine",
+		NamespaceID: namespace.ID,
+		IPAddress:   "10.0.0.1",
+		Expiry:      &now,
 	}
 	app.db.Save(&machine)