diff --git a/plume-models/src/comments.rs b/plume-models/src/comments.rs
index 377e2dda..2a9cac2f 100644
--- a/plume-models/src/comments.rs
+++ b/plume-models/src/comments.rs
@@ -255,9 +255,7 @@ impl FromId<DbConn> for Comment {
                         .and_then(|m| {
                             let author = &Post::get(conn, comm.post_id)?.get_authors(conn)?[0];
                             let not_author = m.link_props.href_string()? != author.ap_url.clone();
-                            Ok(Mention::from_activity(
-                                conn, &m, comm.id, false, not_author,
-                            )?)
+                            Mention::from_activity(conn, &m, comm.id, false, not_author)
                         })
                         .ok();
                 }
diff --git a/plume-models/src/config.rs b/plume-models/src/config.rs
index 3bd3623b..f69597f8 100644
--- a/plume-models/src/config.rs
+++ b/plume-models/src/config.rs
@@ -164,11 +164,8 @@ impl Default for LogoConfig {
             };
             let mut custom_icons = env::vars()
                 .filter_map(|(var, val)| {
-                    if let Some(size) = var.strip_prefix("PLUME_LOGO_") {
-                        Some((size.to_owned(), val))
-                    } else {
-                        None
-                    }
+                    var.strip_prefix("PLUME_LOGO_")
+                        .map(|size| (size.to_owned(), val))
                 })
                 .filter_map(|(var, val)| var.parse::<u64>().ok().map(|var| (var, val)))
                 .map(|(dim, src)| Icon {
diff --git a/plume-models/src/lists.rs b/plume-models/src/lists.rs
index 895120d5..19d270b2 100644
--- a/plume-models/src/lists.rs
+++ b/plume-models/src/lists.rs
@@ -285,7 +285,8 @@ impl List {
             .select(list_elems::word)
             .load::<Option<String>>(conn)
             .map_err(Error::from)
-            .map(|r| r.into_iter().filter_map(|o| o).collect::<Vec<String>>())
+            // .map(|r| r.into_iter().filter_map(|o| o).collect::<Vec<String>>())
+            .map(|r| r.into_iter().flatten().collect::<Vec<String>>())
     }
 
     pub fn clear(&self, conn: &Connection) -> Result<()> {
diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs
index dc0c2a56..f34d6cd0 100644
--- a/plume-models/src/posts.rs
+++ b/plume-models/src/posts.rs
@@ -443,13 +443,7 @@ impl Post {
                     m,
                 )
             })
-            .filter_map(|(id, m)| {
-                if let Some(id) = id {
-                    Some((m, id))
-                } else {
-                    None
-                }
-            })
+            .filter_map(|(id, m)| id.map(|id| (m, id)))
             .collect::<Vec<_>>();
 
         let old_mentions = Mention::list_for_post(&conn, self.id)?;
diff --git a/plume-models/src/safe_string.rs b/plume-models/src/safe_string.rs
index 086395f4..aafd02ae 100644
--- a/plume-models/src/safe_string.rs
+++ b/plume-models/src/safe_string.rs
@@ -156,7 +156,7 @@ impl<'de> Deserialize<'de> for SafeString {
     where
         D: Deserializer<'de>,
     {
-        Ok(deserializer.deserialize_string(SafeStringVisitor)?)
+        deserializer.deserialize_string(SafeStringVisitor)
     }
 }
 
diff --git a/plume-models/src/timeline/query.rs b/plume-models/src/timeline/query.rs
index 7c54dc4f..eef5255b 100644
--- a/plume-models/src/timeline/query.rs
+++ b/plume-models/src/timeline/query.rs
@@ -601,11 +601,10 @@ fn parse_l<'a, 'b>(stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], Lis
 }
 
 fn parse_m<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], Vec<&'a str>)> {
-    let mut res: Vec<&str> = Vec::new();
-    res.push(match stream.get(0)? {
+    let mut res: Vec<&str> = vec![match stream.get(0)? {
         Token::Word(_, _, w) => w,
         t => return t.get_error(Token::Word(0, 0, "any word")),
-    });
+    }];
     stream = &stream[1..];
     while let Token::Comma(_) = stream[0] {
         res.push(match stream.get(1)? {
diff --git a/plume-models/src/users.rs b/plume-models/src/users.rs
index 95b4d758..7924cfd4 100644
--- a/plume-models/src/users.rs
+++ b/plume-models/src/users.rs
@@ -486,10 +486,7 @@ impl User {
             .filter_map(|j| serde_json::from_value(j.clone()).ok())
             .collect::<Vec<T>>();
 
-        let next = match json.get("next") {
-            Some(x) => Some(x.as_str().unwrap().to_owned()),
-            None => None,
-        };
+        let next = json.get("next").map(|x| x.as_str().unwrap().to_owned());
         Ok((items, next))
     }
     pub fn fetch_outbox<T: Activity>(&self) -> Result<Vec<T>> {
diff --git a/src/routes/blogs.rs b/src/routes/blogs.rs
index 294bf79a..df4da910 100644
--- a/src/routes/blogs.rs
+++ b/src/routes/blogs.rs
@@ -348,7 +348,7 @@ pub fn update(
 #[get("/~/<name>/outbox")]
 pub fn outbox(name: String, conn: DbConn) -> Option<ActivityStream<OrderedCollection>> {
     let blog = Blog::find_by_fqn(&conn, &name).ok()?;
-    Some(blog.outbox(&conn).ok()?)
+    blog.outbox(&conn).ok()
 }
 #[allow(unused_variables)]
 #[get("/~/<name>/outbox?<page>")]
@@ -358,7 +358,7 @@ pub fn outbox_page(
     conn: DbConn,
 ) -> Option<ActivityStream<OrderedCollectionPage>> {
     let blog = Blog::find_by_fqn(&conn, &name).ok()?;
-    Some(blog.outbox_page(&conn, page.limits()).ok()?)
+    blog.outbox_page(&conn, page.limits()).ok()
 }
 #[get("/~/<name>/atom.xml")]
 pub fn atom_feed(name: String, conn: DbConn) -> Option<Content<String>> {