diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
index a07e299b3..2a14f98c0 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
@@ -340,16 +340,14 @@ public class DefaultUserInfo implements UserInfo {
     @Basic
     @Column(name="phone_number_verified")
     public Boolean getPhoneNumberVerified() {
-	    // TODO Auto-generated method stub
-	    return null;
+	    return phoneNumberVerified;
     }
 	/* (non-Javadoc)
 	 * @see org.mitre.openid.connect.model.UserInfo#setPhoneNumberVerified(java.lang.Boolean)
 	 */
     @Override
     public void setPhoneNumberVerified(Boolean phoneNumberVerified) {
-	    // TODO Auto-generated method stub
-	    
+    	this.phoneNumberVerified = phoneNumberVerified;	    
     }
 	/* (non-Javadoc)
 	 * @see org.mitre.openid.connect.model.UserInfo#getAddress()
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java
index ab461266f..11f04c874 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java
@@ -386,10 +386,8 @@ public class ConnectOAuth2RequestFactory extends DefaultOAuth2RequestFactory {
 	        return service;
 	        
         } catch (NoSuchAlgorithmException e) {
-	        // TODO Auto-generated catch block
 	        logger.error("Couldn't create symmetric validator for client " + client.getClientId(), e);
         } catch (InvalidKeySpecException e) {
-	        // TODO Auto-generated catch block
 	        logger.error("Couldn't create symmetric validator for client " + client.getClientId(), e);
         }