remove unused variables / imports

also remove static initialization as it may not be supported
in all compilation units

Change-Id: I715a2b5ce8c47cbadced2e29a2b5248e02b32136
diff --git a/gatekeeper.cpp b/gatekeeper.cpp
index 2205801..8cb0a8c 100644
--- a/gatekeeper.cpp
+++ b/gatekeeper.cpp
@@ -26,7 +26,7 @@
 static const uint8_t HANDLE_VERSION = 0;
 struct __attribute__ ((__packed__)) password_handle_t {
     // fields included in signature
-    uint8_t version = HANDLE_VERSION;
+    uint8_t version;
     secure_id_t user_id;
     secure_id_t authenticator_id;
 
@@ -44,8 +44,6 @@
     }
 
     secure_id_t user_id = 0;
-    uint8_t *current_password = NULL;
-    size_t current_password_size = 0;
 
     if (request.password_handle.buffer.get() == NULL) {
         // Password handle does not match what is stored, generate new SecureID
@@ -194,8 +192,10 @@
     AuthToken *token = new AuthToken;
     SizedBuffer serialized_auth_token;
 
+    token->auth_token_version = AUTH_TOKEN_VERSION;
     token->root_secure_user_id = user_id;
     token->auxiliary_secure_user_id = authenticator_id;
+    token->authenticator_id = 0;
     token->timestamp = timestamp;
 
     const uint8_t *auth_token_key = NULL;