diff --git a/controllers/auth.go b/controllers/auth.go
index be15291..5715b92 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -122,16 +122,6 @@ func AddUser(c *gin.Context) {
 		u.GroupId = 2
 	}
 
-	/*
-		// Default to regular user role if not specified
-		if input.RoleId == 0 {
-			log.Printf("Register no role specified, defaulting to builtin role UserRole with id 2.\n")
-			u.RoleId = 2
-		} else {
-			u.RoleId = input.RoleId
-		}
-	*/
-
 	//remove spaces in username
 	u.UserName = html.EscapeString(strings.TrimSpace(u.UserName))
 
@@ -168,45 +158,6 @@ func AddUser(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"message": "user registration success"})
 }
 
-/*
-	func AddRole(c *gin.Context) {
-		var input AddRoleInput
-
-		if err := c.ShouldBindJSON(&input); err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-			return
-		}
-
-		// define the new role properties
-		r := models.Role{}
-		r.RoleName = input.RoleName
-		r.ReadOnly = input.ReadOnly
-		r.Admin = input.Admin
-		r.LdapGroup = input.LdapGroup
-
-		// Check if role already exists
-		testRole, _ := models.GetRoleByName(r.RoleName)
-		log.Printf("AddRole checking if role '%s' already exists\n", r.RoleName)
-
-		if (models.Role{} == testRole) {
-			log.Printf("AddRole confirmed no existing rolename\n")
-		} else {
-			errorString := fmt.Sprintf("attempt to register conflicting rolename '%s'", r.RoleName)
-			log.Printf("Register error : '%s'\n", errorString)
-			c.JSON(http.StatusBadRequest, gin.H{"error": errorString})
-			return
-		}
-
-		_, err := r.AddRole()
-
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"Error creating role": err.Error()})
-			return
-		}
-
-		c.JSON(http.StatusOK, gin.H{"message": "role creation success"})
-	}
-*/
 func Login(c *gin.Context) {
 
 	var input LoginInput
@@ -226,7 +177,7 @@ func Login(c *gin.Context) {
 	token, err := models.LoginCheck(u.UserName, u.Password)
 
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "username or password is incorrect."})
+		c.JSON(http.StatusUnauthorized, gin.H{"error": "username or password is incorrect."})
 		return
 	} else {
 		log.Printf("Login verified, returning token '%s'\n", token)
@@ -255,19 +206,6 @@ func CurrentUser(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"message": "success", "data": u})
 }
 
-/*
-	func GetRoles(c *gin.Context) {
-		roles, err := models.QueryRoles()
-
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-			return
-		}
-
-		c.JSON(http.StatusOK, gin.H{"message": "success", "data": roles})
-	}
-*/
-
 func GetUsers(c *gin.Context) {
 	users, err := models.UserList()