Run gosimple against codebase (#12928)

store/localcachelayer/role_layer.go

@@ -55,11 +55,10 @@ func (s LocalCacheRoleStore) GetByNames(names []string) ([]*model.Role, *model.A
 
 	roles, _ := s.RoleStore.GetByNames(rolesToQuery)
 
-	if roles != nil {
-		for _, role := range roles {
-			s.rootStore.doStandardAddToCache(s.rootStore.roleCache, role.Name, role)
-		}
+	for _, role := range roles {
+		s.rootStore.doStandardAddToCache(s.rootStore.roleCache, role.Name, role)
 	}
+
 	return append(foundRoles, roles...), nil
 }
 

store/sqlstore/user_store.go

@@ -1359,8 +1359,7 @@ func (us SqlUserStore) GetProfilesNotInTeam(teamId string, groupConstrained bool
 }
 
 func (us SqlUserStore) GetEtagForProfilesNotInTeam(teamId string) string {
-	var querystr string
-	querystr = `
+	querystr := `
 		SELECT
 			CONCAT(MAX(UpdateAt), '.', COUNT(Id)) as etag
 		FROM