diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c
index d80eb01e4e..5d12f4c7b1 100644
--- a/app/flatpak-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@@ -219,7 +219,6 @@ build_bundle (OstreeRepo *repo, GFile *file,
 {
   GVariantBuilder metadata_builder;
   GVariantBuilder param_builder;
-
   g_autoptr(GKeyFile) keyfile = NULL;
   g_autoptr(GBytes) xml_data = NULL;
   g_autoptr(GFile) metadata_file = NULL;
diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c
index 37907bd31b..e1d69ca914 100644
--- a/app/flatpak-builtins-build-export.c
+++ b/app/flatpak-builtins-build-export.c
@@ -77,7 +77,6 @@ static gboolean
 metadata_get_arch (GFile *file, char **out_arch, GError **error)
 {
   g_autofree char *path = NULL;
-
   g_autoptr(GKeyFile) keyfile = NULL;
   g_autofree char *runtime = NULL;
   g_auto(GStrv) parts = NULL;
@@ -440,7 +439,6 @@ validate_desktop_file (GFile      *desktop_file,
                        GError    **error)
 {
   g_autofree char *path = g_file_get_path (desktop_file);
-
   g_autoptr(GSubprocess) subprocess = NULL;
   g_autofree char *stdout_buf = NULL;
   g_autofree char *stderr_buf = NULL;
@@ -545,7 +543,6 @@ validate_service_file (GFile      *service_file,
                        GError    **error)
 {
   g_autofree char *path = g_file_get_path (service_file);
-
   g_autoptr(GKeyFile) key_file = NULL;
   g_autofree char *name = NULL;
   g_autofree char *command = NULL;
@@ -604,7 +601,6 @@ static gboolean
 validate_exports (GFile *export, GFile *files, const char *app_id, GError **error)
 {
   g_autofree char *desktop_path = NULL;
-
   g_autoptr(GFile) desktop_file = NULL;
   g_autofree char *service_path = NULL;
   g_autoptr(GFile) service_file = NULL;
@@ -747,7 +743,6 @@ gboolean
 flatpak_builtin_build_export (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GOptionContext) context = NULL;
   g_autoptr(GFile) base = NULL;
   g_autoptr(GFile) files = NULL;
diff --git a/app/flatpak-builtins-build-finish.c b/app/flatpak-builtins-build-finish.c
index 1af3142cca..46261417c4 100644
--- a/app/flatpak-builtins-build-finish.c
+++ b/app/flatpak-builtins-build-finish.c
@@ -75,7 +75,6 @@ export_dir (int           source_parent_fd,
             GError      **error)
 {
   int res;
-
   g_auto(GLnxDirFdIterator) source_iter = {0};
   glnx_autofd int destination_dfd = -1;
   struct dirent *dent;
@@ -293,7 +292,6 @@ static gboolean
 update_metadata (GFile *base, FlatpakContext *arg_context, gboolean is_runtime, GCancellable *cancellable, GError **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) metadata = NULL;
   g_autofree char *path = NULL;
   g_autoptr(GKeyFile) keyfile = NULL;
diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c
index baa668a6cf..ee89de9b65 100644
--- a/app/flatpak-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@@ -58,7 +58,6 @@ import_oci (OstreeRepo *repo, GFile *file,
   g_autofree char *dir_uri = NULL;
   g_autofree char *target_ref = NULL;
   const char *oci_digest;
-
   g_autoptr(FlatpakOciRegistry) registry = NULL;
   g_autoptr(FlatpakOciVersioned) versioned = NULL;
   FlatpakOciManifest *manifest = NULL;
diff --git a/app/flatpak-builtins-create-usb.c b/app/flatpak-builtins-create-usb.c
index 8f2a843478..5a6fb09e21 100644
--- a/app/flatpak-builtins-create-usb.c
+++ b/app/flatpak-builtins-create-usb.c
@@ -280,7 +280,6 @@ ostree_create_usb (GOptionContext *context,
   OstreeRepoMode mode = OSTREE_REPO_MODE_ARCHIVE;
 
   g_debug ("%s: Creating repository in mode %u", G_STRFUNC, mode);
-
   g_autoptr(OstreeRepo) dest_repo = ostree_repo_create_at (mount_root_dfd, dest_repo_path,
                                                            mode, NULL, cancellable, error);
 
@@ -307,7 +306,6 @@ ostree_create_usb (GOptionContext *context,
   GLNX_HASH_TABLE_FOREACH_KV (all_refs, OstreeCollectionRef *, c_r, CommitAndSubpaths *, c_s)
   {
     GVariantBuilder builder;
-
     g_autoptr(GVariant) opts = NULL;
     OstreeRepoPullFlags flags = OSTREE_REPO_PULL_FLAGS_MIRROR;
     GVariantBuilder refs_builder;
diff --git a/app/flatpak-builtins-remote-ls.c b/app/flatpak-builtins-remote-ls.c
index 8ae3d1a491..873fc31f71 100644
--- a/app/flatpak-builtins-remote-ls.c
+++ b/app/flatpak-builtins-remote-ls.c
@@ -109,7 +109,6 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
   guint n_keys;
   g_autofree const char **keys = NULL;
   int i, j;
-
   g_autoptr(GHashTable) pref_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   FlatpakKinds match_kinds;
   g_autofree char *match_id = NULL;
@@ -151,7 +150,6 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
       FlatpakRemoteState *state = remote_state_dir_pair->state;
       const char *remote = state->remote_name;
       g_autoptr(AsStore) store = NULL;
-
       g_autoptr(GHashTable) names = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
       g_hash_table_iter_init (&iter, refs);
diff --git a/app/flatpak-builtins-repair.c b/app/flatpak-builtins-repair.c
index 081b8c7624..4fa69b81c8 100644
--- a/app/flatpak-builtins-repair.c
+++ b/app/flatpak-builtins-repair.c
@@ -122,7 +122,6 @@ fsck_dirtree (OstreeRepo *repo,
               GHashTable *object_status_cache)
 {
   OstreeRepoCommitIterResult iterres;
-
   g_autoptr(GError) local_error = NULL;
   FsckStatus status = 0;
   g_autoptr(GVariant) key = NULL;
diff --git a/app/flatpak-builtins-repo.c b/app/flatpak-builtins-repo.c
index 4d9b6e94ea..899228e5da 100644
--- a/app/flatpak-builtins-repo.c
+++ b/app/flatpak-builtins-repo.c
@@ -359,7 +359,6 @@ print_commits (OstreeRepo *repo,
                GError    **error)
 {
   g_autofree char *checksum = NULL;
-
   g_autoptr(GPtrArray) deltas = NULL;
 
   if (!ostree_repo_list_static_delta_names (repo, &deltas, NULL, error))
diff --git a/app/flatpak-builtins-uninstall.c b/app/flatpak-builtins-uninstall.c
index 50368518f3..b7e4f7b93f 100644
--- a/app/flatpak-builtins-uninstall.c
+++ b/app/flatpak-builtins-uninstall.c
@@ -123,7 +123,6 @@ flatpak_delete_data (gboolean    opt_yes,
                      GError    **error)
 {
   g_autofree char *path = g_build_filename (g_get_home_dir (), ".var", "app", app_id, NULL);
-
   g_autoptr(GFile) file = g_file_new_for_path (path);
 
   if (!opt_yes &&
diff --git a/app/flatpak-builtins-utils.c b/app/flatpak-builtins-utils.c
index a598157837..c3f4d03369 100644
--- a/app/flatpak-builtins-utils.c
+++ b/app/flatpak-builtins-utils.c
@@ -126,7 +126,6 @@ download_uri (const char *url,
               GError    **error)
 {
   SoupSession *session;
-
   g_autoptr(SoupRequest) req = NULL;
   g_autoptr(GInputStream) input = NULL;
   g_autoptr(GOutputStream) out = NULL;
@@ -160,7 +159,6 @@ flatpak_find_installed_pref (const char *pref, FlatpakKinds kinds, const char *d
   g_autofree char *id = NULL;
   g_autofree char *arch = NULL;
   g_autofree char *branch = NULL;
-
   g_autoptr(GError) lookup_error = NULL;
   FlatpakDir *dir = NULL;
   g_autofree char *ref = NULL;
@@ -629,7 +627,6 @@ get_file_age (GFile *file)
 {
   guint64 now;
   guint64 mtime;
-
   g_autoptr(GFileInfo) info = NULL;
 
   info = g_file_query_info (file,
@@ -1180,7 +1177,6 @@ flatpak_dir_load_appstream_store (FlatpakDir   *self,
                                   GError      **error)
 {
   const char *install_path = flatpak_file_get_path_cached (flatpak_dir_get_path (self));
-
   g_autoptr(GFile) appstream_file = NULL;
   g_autofree char *appstream_path = NULL;
   g_autoptr(GError) local_error = NULL;
@@ -1345,7 +1341,6 @@ print_wrapped (int         cols,
 {
   va_list args;
   g_autofree char *msg = NULL;
-
   g_auto(GStrv) lines = NULL;
   int i;
 
diff --git a/app/flatpak-cli-transaction.c b/app/flatpak-cli-transaction.c
index 671b47f202..2fdf6d7928 100644
--- a/app/flatpak-cli-transaction.c
+++ b/app/flatpak-cli-transaction.c
@@ -248,7 +248,6 @@ progress_changed_cb (FlatpakTransactionProgress *progress,
   FlatpakCliTransaction *cli = data;
   FlatpakTransaction *self = FLATPAK_TRANSACTION (cli);
   FlatpakTransactionOperation *op = flatpak_transaction_get_current_operation (self);
-
   g_autoptr(GString) str = g_string_new ("");
   int i;
   int n_full, partial;
@@ -439,7 +438,6 @@ operation_error (FlatpakTransaction            *transaction,
   FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
   FlatpakTransactionOperationType op_type = flatpak_transaction_operation_get_operation_type (op);
   const char *ref = flatpak_transaction_operation_get_ref (op);
-
   g_autoptr(FlatpakRef) rref = flatpak_ref_parse (ref, NULL);
   g_autofree char *msg = NULL;
   gboolean non_fatal = (detail & FLATPAK_TRANSACTION_ERROR_DETAILS_NON_FATAL) != 0;
@@ -510,7 +508,6 @@ end_of_lifed (FlatpakTransaction *transaction,
               const char         *rebase)
 {
   FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
-
   g_autoptr(FlatpakRef) rref = flatpak_ref_parse (ref, NULL);
   g_autofree char *msg = NULL;
 
@@ -618,7 +615,6 @@ append_tags (GPtrArray *tags_array,
              GKeyFile  *old_metadata)
 {
   gsize i, size = 0;
-
   g_auto(GStrv) tags = g_key_file_get_string_list (metadata, FLATPAK_METADATA_GROUP_APPLICATION, "tags",
                                                    &size, NULL);
   g_auto(GStrv) old_tags = NULL;
diff --git a/app/flatpak-complete.c b/app/flatpak-complete.c
index b8ba17b600..e293717e40 100644
--- a/app/flatpak-complete.c
+++ b/app/flatpak-complete.c
@@ -175,7 +175,6 @@ flatpak_complete_partial_ref (FlatpakCompletion *completion,
   g_autofree char *id = NULL;
   g_autofree char *arch = NULL;
   g_autofree char *branch = NULL;
-
   g_auto(GStrv) refs = NULL;
   int element;
   const char *cur_parts[4] = { NULL };
@@ -447,7 +446,6 @@ flatpak_complete_columns (FlatpakCompletion *completion,
 {
   int i;
   const char *list = NULL;
-
   g_auto(GStrv) used = NULL;
 
   if (!g_str_has_prefix (completion->cur, "--columns="))
diff --git a/app/flatpak-table-printer.c b/app/flatpak-table-printer.c
index 80074665e8..bd9ef7eb23 100644
--- a/app/flatpak-table-printer.c
+++ b/app/flatpak-table-printer.c
@@ -371,7 +371,6 @@ flatpak_table_printer_print_full (FlatpakTablePrinter *printer,
   g_autofree int *lwidths = NULL;
   g_autofree int *rwidths = NULL;
   g_autofree int *shrinks = NULL;
-
   g_autoptr(GString) row_s = g_string_new ("");
   int i, j;
   int rows = 0;
diff --git a/common/flatpak-bundle-ref.c b/common/flatpak-bundle-ref.c
index 60f74a61dd..9098ee186e 100644
--- a/common/flatpak-bundle-ref.c
+++ b/common/flatpak-bundle-ref.c
@@ -287,7 +287,6 @@ flatpak_bundle_ref_new (GFile   *file,
 {
   FlatpakRefKind kind = FLATPAK_REF_KIND_APP;
   FlatpakBundleRefPrivate *priv;
-
   g_auto(GStrv) parts = NULL;
   FlatpakBundleRef *ref;
   g_autoptr(GVariant) metadata = NULL;
diff --git a/common/flatpak-bwrap.c b/common/flatpak-bwrap.c
index f419d23fc1..730f771d93 100644
--- a/common/flatpak-bwrap.c
+++ b/common/flatpak-bwrap.c
@@ -285,7 +285,6 @@ flatpak_bwrap_bundle_args (FlatpakBwrap *bwrap,
   gint i;
   gsize data_len = 0;
   int fd;
-
   g_auto(GLnxTmpfile) args_tmpf  = { 0, };
 
   if (end == -1)
diff --git a/common/flatpak-context.c b/common/flatpak-context.c
index 7fac3decaa..15d422ff27 100644
--- a/common/flatpak-context.c
+++ b/common/flatpak-context.c
@@ -423,7 +423,6 @@ flatpak_context_get_session_bus_policy_allowed_own_names (FlatpakContext *contex
 {
   GHashTableIter iter;
   gpointer key, value;
-
   g_autoptr(GPtrArray) names = g_ptr_array_new_with_free_func (g_free);
 
   g_hash_table_iter_init (&iter, context->session_bus_policy);
@@ -1024,7 +1023,6 @@ option_env_cb (const gchar *option_name,
                GError     **error)
 {
   FlatpakContext *context = data;
-
   g_auto(GStrv) split = g_strsplit (value, "=", 2);
 
   if (split == NULL || split[0] == NULL || split[0][0] == 0 || split[1] == NULL)
@@ -1270,7 +1268,6 @@ flatpak_context_load_metadata (FlatpakContext *context,
                                GError        **error)
 {
   gboolean remove;
-
   g_auto(GStrv) groups = NULL;
   int i;
 
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 03694e801b..42a26085a4 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -1780,7 +1780,6 @@ flatpak_load_override_keyfile (const char *app_id, gboolean user, GError **error
 {
   g_autofree char *metadata_contents = NULL;
   gsize metadata_size;
-
   g_autoptr(GKeyFile) metakey = g_key_file_new ();
   g_autoptr(FlatpakDir) dir = NULL;
 
@@ -1803,7 +1802,6 @@ FlatpakContext *
 flatpak_load_override_file (const char *app_id, gboolean user, GError **error)
 {
   g_autoptr(FlatpakContext) overrides = flatpak_context_new ();
-
   g_autoptr(GKeyFile) metakey = NULL;
   g_autoptr(GError) my_error = NULL;
 
@@ -2273,7 +2271,6 @@ add_appdata_to_deploy_data (GVariantBuilder *metadata_builder,
                             const char      *id)
 {
   g_autofree char *appdata_xml = NULL;
-
   g_autoptr(GHashTable) names = NULL;
   g_autoptr(GHashTable) comments = NULL;
   g_autofree char *version = NULL;
@@ -3621,7 +3618,6 @@ flatpak_dir_update_appstream (FlatpakDir          *self,
   const char *used_branch = NULL;
   g_autofree char *remote_and_branch = NULL;
   g_autofree char *new_checksum = NULL;
-
   g_autoptr(GError) first_error = NULL;
   g_autoptr(GError) second_error = NULL;
   g_autoptr(FlatpakRemoteState) state = NULL;
@@ -3891,7 +3887,6 @@ repo_pull (OstreeRepo                           *self,
   gboolean force_disable_deltas = (flatpak_flags & FLATPAK_PULL_FLAGS_NO_STATIC_DELTAS) != 0;
   g_autofree char *remote_and_branch = NULL;
   g_autofree char *current_checksum = NULL;
-
   g_autoptr(GVariant) old_commit = NULL;
   g_autoptr(GVariant) new_commit = NULL;
   const char *revs_to_fetch[2];
@@ -4614,7 +4609,6 @@ flatpak_dir_pull (FlatpakDir                           *self,
   gboolean ret = FALSE;
   g_autofree char *rev = NULL;
   g_autofree char *url = NULL;
-
   g_autoptr(GPtrArray) subdirs_arg = NULL;
   g_auto(OstreeRepoFinderResultv) allocated_results = NULL;
   const OstreeRepoFinderResult * const *results;
@@ -4834,7 +4828,6 @@ repo_pull_local_untrusted (FlatpakDir          *self,
   /* The latter flag was introduced in https://github.com/ostreedev/ostree/pull/926 */
   const OstreeRepoPullFlags flags = OSTREE_REPO_PULL_FLAGS_UNTRUSTED | OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES;
   GVariantBuilder builder;
-
   g_autoptr(GVariant) options = NULL;
   g_auto(GVariantBuilder) refs_builder = FLATPAK_VARIANT_BUILDER_INITIALIZER;
   gboolean res;
@@ -5283,7 +5276,6 @@ flatpak_dir_list_refs_for_name (FlatpakDir   *self,
                                 GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) base = NULL;
   g_autoptr(GFile) dir = NULL;
   g_autoptr(GFileEnumerator) dir_enum = NULL;
@@ -5383,7 +5375,6 @@ flatpak_dir_list_refs (FlatpakDir   *self,
                        GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) base = NULL;
   g_autoptr(GFileEnumerator) dir_enum = NULL;
   g_autoptr(GFileInfo) child_info = NULL;
@@ -5461,7 +5452,6 @@ flatpak_dir_read_latest_commit (FlatpakDir   *self,
 {
   g_autofree char *remote_and_ref = NULL;
   g_autofree char *res = NULL;
-
   g_autoptr(GVariant) commit_data = NULL;
 
   /* There may be several remotes with the same branch (if we for
@@ -5556,7 +5546,6 @@ flatpak_dir_set_active (FlatpakDir   *self,
                         GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) deploy_base = NULL;
   g_autoptr(GFile) active_tmp_link = NULL;
   g_autoptr(GFile) active_link = NULL;
@@ -5600,7 +5589,6 @@ flatpak_dir_run_triggers (FlatpakDir   *self,
                           GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFileEnumerator) dir_enum = NULL;
   g_autoptr(GFileInfo) child_info = NULL;
   g_autoptr(GFile) triggersdir = NULL;
@@ -5811,7 +5799,6 @@ export_ini_file (int                 parent_fd,
 {
   glnx_autofd int desktop_fd = -1;
   g_autofree char *tmpfile_name = g_strdup_printf ("export-ini-XXXXXX");
-
   g_autoptr(GOutputStream) out_stream = NULL;
   g_autofree gchar *data = NULL;
   gsize data_len;
@@ -5926,7 +5913,6 @@ export_mime_file (int           parent_fd,
 {
   glnx_autofd int desktop_fd = -1;
   g_autofree char *tmpfile_name = g_strdup_printf ("export-mime-XXXXXX");
-
   g_autoptr(GOutputStream) out_stream = NULL;
   g_autofree gchar *data = NULL;
   gsize data_len;
@@ -5998,7 +5984,6 @@ export_desktop_file (const char   *app,
   gboolean ret = FALSE;
   glnx_autofd int desktop_fd = -1;
   g_autofree char *tmpfile_name = g_strdup_printf ("export-desktop-XXXXXX");
-
   g_autoptr(GOutputStream) out_stream = NULL;
   g_autofree gchar *data = NULL;
   gsize data_len;
@@ -6161,7 +6146,6 @@ rewrite_export_dir (const char     *app,
                     GError        **error)
 {
   gboolean ret = FALSE;
-
   g_auto(GLnxDirFdIterator) source_iter = {0};
   g_autoptr(GHashTable) visited_children = NULL;
   struct dirent *dent;
@@ -6313,7 +6297,6 @@ flatpak_rewrite_export_dir (const char   *app,
                             GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) parent = g_file_get_parent (source);
   glnx_autofd int parentfd = -1;
   g_autofree char *name = g_file_get_basename (source);
@@ -6359,7 +6342,6 @@ export_dir (int           source_parent_fd,
 {
   gboolean ret = FALSE;
   int res;
-
   g_auto(GLnxDirFdIterator) source_iter = {0};
   glnx_autofd int destination_dfd = -1;
   struct dirent *dent;
@@ -6487,7 +6469,6 @@ flatpak_dir_update_exports (FlatpakDir   *self,
                             GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) exports = NULL;
   g_autofree char *current_ref = NULL;
   g_autofree char *active_id = NULL;
@@ -6884,7 +6865,6 @@ flatpak_dir_deploy (FlatpakDir          *self,
                     GError             **error)
 {
   g_autofree char *resolved_ref = NULL;
-
   g_autoptr(GFile) root = NULL;
   g_autoptr(GFile) deploy_base = NULL;
   g_autoptr(GFile) checkoutdir = NULL;
@@ -7879,7 +7859,6 @@ flatpak_dir_ensure_bundle_remote (FlatpakDir   *self,
 {
   g_autofree char *ref = NULL;
   gboolean created_remote = FALSE;
-
   g_autoptr(GVariant) deploy_data = NULL;
   g_autoptr(GVariant) metadata = NULL;
   g_autofree char *origin = NULL;
@@ -8026,7 +8005,6 @@ flatpak_dir_install_bundle (FlatpakDir   *self,
                             GError      **error)
 {
   g_autofree char *ref = NULL;
-
   g_autoptr(GVariant) deploy_data = NULL;
   g_autoptr(GVariant) metadata = NULL;
   g_autofree char *origin = NULL;
@@ -8480,7 +8458,6 @@ flatpak_dir_uninstall (FlatpakDir                 *self,
   gboolean is_app;
   const char *name;
   g_autofree char *old_active = NULL;
-
   g_auto(GStrv) parts = NULL;
   g_auto(GLnxLockFile) lock = { 0, };
   g_autoptr(GVariant) deploy_data = NULL;
@@ -8615,7 +8592,6 @@ flatpak_dir_collect_deployed_refs (FlatpakDir   *self,
                                    GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) dir = NULL;
   g_autoptr(GFileEnumerator) dir_enum = NULL;
   g_autoptr(GFileInfo) child_info = NULL;
@@ -8672,7 +8648,6 @@ flatpak_dir_collect_unmaintained_refs (FlatpakDir   *self,
                                        GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) unmaintained_dir = NULL;
   g_autoptr(GFileEnumerator) unmaintained_dir_enum = NULL;
   g_autoptr(GFileInfo) child_info = NULL;
@@ -8726,7 +8701,6 @@ flatpak_dir_list_deployed (FlatpakDir   *self,
                            GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) deploy_base = NULL;
   g_autoptr(GPtrArray) ids = NULL;
   GError *temp_error = NULL;
@@ -8792,7 +8766,6 @@ dir_is_locked (GFile *dir)
 {
   glnx_autofd int ref_fd = -1;
   struct flock lock = {0};
-
   g_autoptr(GFile) reffile = NULL;
 
   reffile = g_file_resolve_relative_path (dir, "files/.ref");
@@ -9068,7 +9041,6 @@ flatpak_dir_cleanup_removed (FlatpakDir   *self,
                              GError      **error)
 {
   gboolean ret = FALSE;
-
   g_autoptr(GFile) removed_dir = NULL;
   g_autoptr(GFileEnumerator) dir_enum = NULL;
   g_autoptr(GFileInfo) child_info = NULL;
@@ -9124,7 +9096,6 @@ flatpak_dir_prune (FlatpakDir   *self,
   gint objects_total, objects_pruned;
   guint64 pruned_object_size_total;
   g_autofree char *formatted_freed_size = NULL;
-
   g_autoptr(GError) local_error = NULL;
   g_autoptr(GError) lock_error = NULL;
   g_auto(GLnxLockFile) lock = { 0, };
@@ -9491,7 +9462,6 @@ flatpak_dir_remote_fetch_summary (FlatpakDir   *self,
 {
   g_autofree char *url = NULL;
   gboolean is_local;
-
   g_autoptr(GError) local_error = NULL;
   g_autoptr(GBytes) summary = NULL;
   g_autoptr(GBytes) summary_sig = NULL;
@@ -10120,7 +10090,6 @@ flatpak_dir_find_remote_refs (FlatpakDir           *self,
                               GError              **error)
 {
   g_autofree char *collection_id = NULL;
-
   g_autoptr(GHashTable) remote_refs = NULL;
   g_autoptr(FlatpakRemoteState) state = NULL;
   GPtrArray *matched_refs;
@@ -10218,7 +10187,6 @@ flatpak_dir_find_remote_ref (FlatpakDir   *self,
 {
   g_autofree char *collection_id = NULL;
   g_autofree char *remote_ref = NULL;
-
   g_autoptr(GHashTable) remote_refs = NULL;
   g_autoptr(FlatpakRemoteState) state = NULL;
   g_autoptr(GError) my_error = NULL;
@@ -10266,7 +10234,6 @@ list_collection_refs_from_ostree_repo (OstreeRepo   *repo,
   GHashTableIter iter;
   gpointer key;
   GHashTable *coll_refs = NULL;
-
   g_autoptr(GHashTable) refs = NULL;
 
   /* FIXME: Use ostree_repo_list_collection_refs when it's public */
@@ -10304,7 +10271,6 @@ flatpak_dir_find_local_refs (FlatpakDir           *self,
                              GError              **error)
 {
   g_autofree char *collection_id = NULL;
-
   g_autoptr(GHashTable) local_refs = NULL;
   g_autoptr(GError) my_error = NULL;
   g_autofree char *refspec_prefix = g_strconcat (remote, ":.", NULL);
@@ -10446,7 +10412,6 @@ flatpak_dir_find_installed_ref (FlatpakDir   *self,
                                 GError      **error)
 {
   g_autofree char *local_ref = NULL;
-
   g_autoptr(GHashTable) local_refs = NULL;
   g_autoptr(GError) my_error = NULL;
 
@@ -10944,7 +10909,6 @@ create_origin_remote_config (OstreeRepo *repo,
                              GKeyFile  **new_config)
 {
   g_autofree char *remote = NULL;
-
   g_auto(GStrv) remotes = NULL;
   int version = 0;
   g_autofree char *group = NULL;
@@ -11147,7 +11111,6 @@ parse_ref_file (GKeyFile *keyfile,
   g_autofree char *name = NULL;
   g_autofree char *branch = NULL;
   g_autofree char *version = NULL;
-
   g_autoptr(GBytes) gpg_data = NULL;
   gboolean is_runtime = FALSE;
   g_autofree char *collection_id = NULL;
@@ -11492,7 +11455,6 @@ flatpak_dir_remove_remote (FlatpakDir   *self,
                            GError      **error)
 {
   g_autofree char *prefix = NULL;
-
   g_autoptr(GHashTable) refs = NULL;
   GHashTableIter hash_iter;
   gpointer key;
@@ -11641,7 +11603,6 @@ flatpak_dir_modify_remote (FlatpakDir   *self,
   g_autofree char *group = g_strdup_printf ("remote \"%s\"", remote_name);
   g_autofree char *url = NULL;
   g_autofree char *metalink = NULL;
-
   g_autoptr(GKeyFile) new_config = NULL;
   g_auto(GStrv) keys = NULL;
   int i;
@@ -11971,7 +11932,6 @@ flatpak_dir_update_remote_configuration_for_state (FlatpakDir         *self,
     OSTREE_META_KEY_DEPLOY_COLLECTION_ID,
     NULL
   };
-
   g_autoptr(GPtrArray) updated_params = NULL;
   GVariantIter iter;
   g_autoptr(GBytes) gpg_keys = NULL;
@@ -12097,7 +12057,6 @@ flatpak_dir_update_remote_configuration (FlatpakDir   *self,
                                          GError      **error)
 {
   gboolean is_oci;
-
   g_autoptr(FlatpakRemoteState) state = NULL;
 
   if (flatpak_dir_get_remote_disabled (self, remote))
@@ -12194,7 +12153,6 @@ flatpak_dir_fetch_remote_object (FlatpakDir   *self,
   g_autofree char *object_url = NULL;
   g_autofree char *part1 = NULL;
   g_autofree char *part2 = NULL;
-
   g_autoptr(GBytes) bytes = NULL;
 
   if (!ostree_repo_remote_get_url (self->repo, remote_name, &base_url, error))
@@ -12389,7 +12347,6 @@ flatpak_dir_find_remote_related_for_metadata (FlatpakDir         *self,
                                               GError            **error)
 {
   int i;
-
   g_auto(GStrv) parts = NULL;
   g_autoptr(GPtrArray) related = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_related_free);
   g_autofree char *url = NULL;
@@ -12512,7 +12469,6 @@ flatpak_dir_find_remote_related (FlatpakDir         *self,
                                  GError            **error)
 {
   const char *metadata = NULL;
-
   g_autoptr(GKeyFile) metakey = g_key_file_new ();
   g_auto(GStrv) parts = NULL;
   g_autoptr(GPtrArray) related = NULL;
@@ -12548,7 +12504,6 @@ local_match_prefix (FlatpakDir *self,
                     const char *remote)
 {
   GPtrArray *matches = g_ptr_array_new_with_free_func (g_free);
-
   g_auto(GStrv) parts = NULL;
   g_autofree char *parts_prefix = NULL;
   g_autoptr(GHashTable) refs = NULL;
@@ -12599,7 +12554,6 @@ flatpak_dir_find_local_related_for_metadata (FlatpakDir   *self,
                                              GError      **error)
 {
   int i;
-
   g_auto(GStrv) parts = NULL;
   g_autoptr(GPtrArray) related = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_related_free);
   g_autofree char *collection_id = NULL;
@@ -12852,7 +12806,6 @@ get_locale_langs_from_accounts_dbus (GDBusProxy *proxy, GPtrArray *langs)
 {
   const char *accounts_bus_name = "org.freedesktop.Accounts";
   const char *accounts_interface_name = "org.freedesktop.Accounts.User";
-
   g_auto(GStrv) object_paths = NULL;
   int i;
   g_autoptr(GVariant) ret = NULL;
diff --git a/common/flatpak-exports.c b/common/flatpak-exports.c
index 21a8b17b3e..2feb239622 100644
--- a/common/flatpak-exports.c
+++ b/common/flatpak-exports.c
@@ -225,7 +225,6 @@ flatpak_exports_append_bwrap_args (FlatpakExports *exports,
 {
   guint n_keys;
   g_autofree const char **keys = (const char **) g_hash_table_get_keys_as_array (exports->hash, &n_keys);
-
   g_autoptr(GList) eps = NULL;
   GList *l;
 
@@ -300,7 +299,6 @@ flatpak_exports_path_get_mode (FlatpakExports *exports,
   g_autofree const char **keys = (const char **) g_hash_table_get_keys_as_array (exports->hash, &n_keys);
   g_autofree char *canonical = NULL;
   gboolean is_readonly = FALSE;
-
   g_auto(GStrv) parts = NULL;
   int i;
   g_autoptr(GString) path_builder = g_string_new ("");
diff --git a/common/flatpak-installation.c b/common/flatpak-installation.c
index 218613c0a4..7f47c8a36a 100644
--- a/common/flatpak-installation.c
+++ b/common/flatpak-installation.c
@@ -534,7 +534,6 @@ const char *
 flatpak_installation_get_display_name (FlatpakInstallation *self)
 {
   FlatpakInstallationPrivate *priv = flatpak_installation_get_instance_private (self);
-
   g_autoptr(FlatpakDir) dir = flatpak_installation_get_dir_maybe_no_repo (self);
 
   if (priv->display_name == NULL)
@@ -1204,7 +1203,6 @@ list_remotes_for_configured_remote (FlatpakInstallation *self,
   const OstreeCollectionRef *refs[3] = { NULL, };
   g_autofree gchar *appstream_ref = NULL;
   g_autofree gchar *appstream2_ref = NULL;
-
   g_auto(OstreeRepoFinderResultv) results = NULL;
   g_autoptr(GAsyncResult) result = NULL;
   g_autoptr(OstreeRepoFinder) finder_mount = NULL, finder_avahi = NULL;
@@ -2903,7 +2901,6 @@ flatpak_installation_list_unused_refs (FlatpakInstallation *self,
                                        GError             **error)
 {
   FlatpakDir *dir;
-
   g_autoptr(GHashTable) refs_hash = NULL;
   g_autoptr(GPtrArray) refs =  NULL;
   g_auto(GStrv) app_refs = NULL;
@@ -2961,7 +2958,6 @@ flatpak_installation_list_unused_refs (FlatpakInstallation *self,
   GLNX_HASH_TABLE_FOREACH (used_runtimes, const char *, runtime)
   {
     g_autofree char *runtime_ref = g_strconcat ("runtime/", runtime, NULL);
-
     g_autoptr(FlatpakDeploy) deploy = NULL;
     g_autofree char *origin = NULL;
     g_autofree char *sdk = NULL;
diff --git a/common/flatpak-installed-ref.c b/common/flatpak-installed-ref.c
index 453a659148..11c085419f 100644
--- a/common/flatpak-installed-ref.c
+++ b/common/flatpak-installed-ref.c
@@ -633,7 +633,6 @@ flatpak_installed_ref_new (const char  *full_ref,
 {
   FlatpakRefKind kind = FLATPAK_REF_KIND_APP;
   FlatpakInstalledRef *ref;
-
   g_auto(GStrv) parts = NULL;
 
   parts = g_strsplit (full_ref, "/", -1);
diff --git a/common/flatpak-instance.c b/common/flatpak-instance.c
index bad1f4187a..49304897ef 100644
--- a/common/flatpak-instance.c
+++ b/common/flatpak-instance.c
@@ -308,7 +308,6 @@ static GKeyFile *
 get_instance_info (const char *dir)
 {
   g_autofree char *file = NULL;
-
   g_autoptr(GKeyFile) key_file = NULL;
   g_autoptr(GError) error = NULL;
 
@@ -330,7 +329,6 @@ get_child_pid (const char *dir)
   g_autofree char *file = NULL;
   g_autofree char *contents = NULL;
   gsize length;
-
   g_autoptr(GError) error = NULL;
   g_autoptr(JsonParser) parser = NULL;
   JsonNode *node;
@@ -368,7 +366,6 @@ get_pid (const char *dir)
 {
   g_autofree char *file = NULL;
   g_autofree char *contents = NULL;
-
   g_autoptr(GError) error = NULL;
 
   file = g_build_filename (dir, "pid", NULL);
diff --git a/common/flatpak-oci-registry.c b/common/flatpak-oci-registry.c
index 09462926f2..07b1224f3d 100644
--- a/common/flatpak-oci-registry.c
+++ b/common/flatpak-oci-registry.c
@@ -355,7 +355,6 @@ static gboolean
 verify_oci_version (GBytes *oci_layout_bytes, gboolean *not_json, GCancellable *cancellable, GError **error)
 {
   const char *version;
-
   g_autoptr(JsonNode) node = NULL;
   JsonObject *oci_layout;
 
@@ -776,7 +775,6 @@ flatpak_oci_registry_mirror_blob (FlatpakOciRegistry    *self,
 {
   g_autofree char *src_subpath = NULL;
   g_autofree char *dst_subpath = NULL;
-
   g_auto(GLnxTmpfile) tmpf = { 0 };
   g_autoptr(GOutputStream) out_stream = NULL;
   struct stat stbuf;
@@ -876,7 +874,6 @@ flatpak_oci_registry_load_blob (FlatpakOciRegistry *self,
                                 GError            **error)
 {
   g_autofree char *subpath = NULL;
-
   g_autoptr(GBytes) bytes = NULL;
   g_autofree char *json_checksum = NULL;
 
@@ -1057,7 +1054,6 @@ flatpak_oci_layer_writer_compress (FlatpakOciLayerWriter *self,
   GConverterResult res;
   gsize total_bytes_read, bytes_read, bytes_written, to_write_len;
   guchar *to_write;
-
   g_autoptr(GError) local_error = NULL;
   GConverterFlags flags = 0;
   bytes_read = 0;
@@ -1612,7 +1608,6 @@ flatpak_gpgme_new_ctx (const char *homedir,
                        GError    **error)
 {
   gpgme_error_t err;
-
   g_auto(gpgme_ctx_t) context = NULL;
 
   if ((err = gpgme_new (&context)) != GPG_ERR_NO_ERROR)
@@ -1776,7 +1771,6 @@ flatpak_gpgme_ctx_tmp_home_dir (gpgme_ctx_t   gpgme_ctx,
 {
   g_autofree char *tmp_home_dir_pattern = NULL;
   gpgme_error_t gpg_error;
-
   g_autoptr(GFile) keyring_file = NULL;
   g_autofree char *keyring_name = NULL;
 
@@ -1826,7 +1820,6 @@ flatpak_oci_verify_signature (OstreeRepo *repo,
 {
   gpgme_ctx_t context;
   gpgme_error_t gpg_error;
-
   g_auto(gpgme_data_t) signed_data_buffer = NULL;
   g_auto(gpgme_data_t) plain_buffer = NULL;
   gpgme_verify_result_t vresult;
@@ -1933,7 +1926,6 @@ flatpak_oci_index_ensure_cached (SoupSession  *soup_session,
                                  GError      **error)
 {
   g_autofree char *index_path = g_file_get_path (index);
-
   g_autoptr(SoupURI) base_uri = NULL;
   g_autoptr(SoupURI) query_uri = NULL;
   g_autofree char *query_uri_s = NULL;
diff --git a/common/flatpak-related-ref.c b/common/flatpak-related-ref.c
index ec4c6860a0..27f52f3fdf 100644
--- a/common/flatpak-related-ref.c
+++ b/common/flatpak-related-ref.c
@@ -277,7 +277,6 @@ flatpak_related_ref_new (const char *collection_id,
 {
   FlatpakRefKind kind = FLATPAK_REF_KIND_APP;
   FlatpakRelatedRef *ref;
-
   g_auto(GStrv) parts = NULL;
 
   parts = g_strsplit (full_ref, "/", -1);
diff --git a/common/flatpak-remote-ref.c b/common/flatpak-remote-ref.c
index 2fd1115c23..2bbc35ece3 100644
--- a/common/flatpak-remote-ref.c
+++ b/common/flatpak-remote-ref.c
@@ -326,7 +326,6 @@ flatpak_remote_ref_new (FlatpakCollectionRef *coll_ref,
   FlatpakRefKind kind = FLATPAK_REF_KIND_APP;
   guint64 download_size = 0, installed_size = 0;
   const char *metadata = NULL;
-
   g_autoptr(GBytes) metadata_bytes = NULL;
   g_auto(GStrv) parts = NULL;
   FlatpakRemoteRef *ref;
diff --git a/common/flatpak-remote.c b/common/flatpak-remote.c
index 28ed89734f..3fbe33fb8c 100644
--- a/common/flatpak-remote.c
+++ b/common/flatpak-remote.c
@@ -867,7 +867,6 @@ flatpak_remote_commit (FlatpakRemote *self,
   FlatpakRemotePrivate *priv = flatpak_remote_get_instance_private (self);
   OstreeRepo *repo;
   g_autofree char *url = NULL;
-
   g_autoptr(GKeyFile) config = NULL;
   g_autofree char *group = g_strdup_printf ("remote \"%s\"", priv->name);
 
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 3bbfb46874..42e8bc05c6 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -687,7 +687,6 @@ add_bwrap_wrapper (FlatpakBwrap *bwrap,
                    GError      **error)
 {
   glnx_autofd int app_info_fd = -1;
-
   g_auto(GLnxDirFdIterator) dir_iter = { 0 };
   struct dirent *dent;
   g_autofree char *user_runtime_dir = flatpak_get_real_xdg_runtime_dir ();
@@ -772,7 +771,6 @@ start_dbus_proxy (FlatpakBwrap *app_bwrap,
   char x = 'x';
   const char *proxy;
   g_autofree char *commandline = NULL;
-
   g_autoptr(FlatpakBwrap) proxy_bwrap = NULL;
   int sync_fds[2] = {-1, -1};
   int proxy_start_index;
@@ -1652,7 +1650,6 @@ static void
 flatpak_run_gc_ids (void)
 {
   g_autofree char *base_dir = g_build_filename (g_get_user_runtime_dir (), ".flatpak", NULL);
-
   g_auto(GLnxDirFdIterator) iter = { 0 };
   struct dirent *dent;
 
@@ -2037,7 +2034,6 @@ flatpak_run_add_app_info_args (FlatpakBwrap   *bwrap,
   g_autofree char *info_path = NULL;
   g_autofree char *bwrapinfo_path = NULL;
   int fd, fd2, fd3;
-
   g_autoptr(GKeyFile) keyfile = NULL;
   g_autofree char *runtime_path = NULL;
   g_autofree char *old_dest = g_strdup_printf ("/run/user/%d/flatpak-info", getuid ());
@@ -2679,7 +2675,6 @@ flatpak_run_setup_base_argv (FlatpakBwrap   *bwrap,
   struct group *g;
   gulong pers;
   gid_t gid = getgid ();
-
   g_autoptr(GFile) etc = NULL;
 
   g = getgrgid (gid);
@@ -2855,7 +2850,6 @@ forward_file (XdpDbusDocuments *documents,
 {
   int fd, fd_id;
   g_autofree char *doc_id = NULL;
-
   g_autoptr(GUnixFDList) fd_list = NULL;
   const char *perms[] = { "read", "write", NULL };
 
diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c
index 9051ef5f88..f5862c4569 100644
--- a/common/flatpak-transaction.c
+++ b/common/flatpak-transaction.c
@@ -447,7 +447,6 @@ void
 flatpak_transaction_add_default_dependency_sources (FlatpakTransaction *self)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_autoptr(GPtrArray) system_dirs = NULL;
   GFile *path = flatpak_dir_get_path (priv->dir);
   int i;
@@ -478,7 +477,6 @@ ref_is_installed (FlatpakTransaction *self,
                   GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_autoptr(GFile) deploy_dir = NULL;
   FlatpakDir *dir = priv->dir;
   int i;
@@ -1088,7 +1086,6 @@ initable_init (GInitable    *initable,
 {
   FlatpakTransaction *self = FLATPAK_TRANSACTION (initable);
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_autoptr(FlatpakDir) dir = NULL;
 
   if (priv->installation == NULL)
@@ -1452,7 +1449,6 @@ add_related (FlatpakTransaction          *self,
              GError                     **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_autoptr(FlatpakRemoteState) state = NULL;
   g_autoptr(GPtrArray) related = NULL;
   g_autoptr(GError) local_error = NULL;
@@ -1532,7 +1528,6 @@ find_runtime_remote (FlatpakTransaction             *self,
                      GError                        **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_auto(GStrv) remotes = NULL;
   const char *app_pref;
   const char *runtime_pref;
@@ -1668,7 +1663,6 @@ flatpak_transaction_add_ref (FlatpakTransaction             *self,
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   g_autofree char *origin = NULL;
-
   g_auto(GStrv) parts = NULL;
   const char *pref;
   g_autofree char *origin_remote = NULL;
@@ -1828,7 +1822,6 @@ flatpak_transaction_add_install_flatpakref (FlatpakTransaction *self,
                                             GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_autoptr(GKeyFile) keyfile = g_key_file_new ();
   g_autoptr(GError) local_error = NULL;
 
@@ -1901,7 +1894,6 @@ flatpak_transaction_update_metadata (FlatpakTransaction *self,
                                      GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_auto(GStrv) remotes = NULL;
   int i;
   GList *l;
@@ -1970,7 +1962,6 @@ static GBytes *
 load_deployed_metadata (FlatpakTransaction *self, const char *ref)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_autoptr(GFile) deploy_dir = NULL;
   g_autoptr(GFile) metadata_file = NULL;
   g_autofree char *metadata_contents = NULL;
@@ -2037,7 +2028,6 @@ resolve_p2p_ops (FlatpakTransaction *self,
                  GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_autoptr(GPtrArray) resolves = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_dir_resolve_free);
   GList *l;
   int i;
@@ -2089,7 +2079,6 @@ resolve_ops (FlatpakTransaction *self,
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   GList *l;
-
   g_autoptr(GList) collection_id_ops = NULL;
 
 
@@ -2426,7 +2415,6 @@ handle_suggested_remote_name (FlatpakTransaction *self, GKeyFile *keyfile, GErro
   g_autofree char *name = NULL;
   g_autofree char *url = NULL;
   g_autofree char *collection_id = NULL;
-
   g_autoptr(GKeyFile) config = NULL;
   g_autoptr(GBytes) gpg_key = NULL;
   gboolean res;
@@ -2480,7 +2468,6 @@ static gboolean
 handle_runtime_repo_deps (FlatpakTransaction *self, const char *id, const char *dep_url, GError **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-
   g_autoptr(GBytes) dep_data = NULL;
   g_autofree char *runtime_url = NULL;
   g_autofree char *new_remote = NULL;
@@ -2636,7 +2623,6 @@ handle_runtime_repo_deps_from_bundle (FlatpakTransaction *self,
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   g_autofree char *dep_url = NULL;
   g_autofree char *ref = NULL;
-
   g_auto(GStrv) ref_parts = NULL;
   g_autoptr(GVariant) metadata = NULL;
 
@@ -2743,7 +2729,6 @@ flatpak_transaction_real_run (FlatpakTransaction *self,
   gboolean succeeded = TRUE;
   gboolean needs_prune = FALSE;
   gboolean needs_triggers = FALSE;
-
   g_autoptr(GMainContextPopDefault) main_context = NULL;
   gboolean ready_res = FALSE;
   int i;
diff --git a/common/flatpak-utils-http.c b/common/flatpak-utils-http.c
index 997c9db817..6a77f6a64e 100644
--- a/common/flatpak-utils-http.c
+++ b/common/flatpak-utils-http.c
@@ -130,7 +130,6 @@ load_cache_http_data (int           dfd,
                       GError      **error)
 {
   g_autoptr(CacheHttpData) data = NULL;
-
   g_autoptr(GBytes) cache_bytes = glnx_lgetxattrat (dfd, name,
                                                     CACHE_HTTP_XATTR,
                                                     error);
@@ -329,7 +328,6 @@ stream_closed (GObject *source, GAsyncResult *res, gpointer user_data)
 {
   LoadUriData *data = user_data;
   GInputStream *stream = G_INPUT_STREAM (source);
-
   g_autoptr(GError) error = NULL;
 
   if (!g_input_stream_close_finish (stream, res, &error))
@@ -408,7 +406,6 @@ load_uri_callback (GObject      *source_object,
                    gpointer      user_data)
 {
   SoupRequestHTTP *request = SOUP_REQUEST_HTTP (source_object);
-
   g_autoptr(GInputStream) in = NULL;
   LoadUriData *data = user_data;
 
@@ -520,7 +517,6 @@ flatpak_load_http_uri (SoupSession           *soup_session,
                        GError               **error)
 {
   GBytes *bytes = NULL;
-
   g_autoptr(GMainContext) context = NULL;
   g_autoptr(SoupRequestHTTP) request = NULL;
   g_autoptr(GMainLoop) loop = NULL;
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index e656f56838..0f304cfc21 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -1221,7 +1221,6 @@ _flatpak_split_partial_ref_arg (const char   *partial_ref,
   const char *branch_start = NULL;
   const char *branch_end = NULL;
   g_autofree char *branch = NULL;
-
   g_autoptr(GError) local_error = NULL;
   FlatpakKinds kinds = 0;
 
@@ -1395,7 +1394,6 @@ flatpak_list_deployed_refs (const char   *type,
                             GError      **error)
 {
   gchar **ret = NULL;
-
   g_autoptr(GPtrArray) names = NULL;
   g_autoptr(GHashTable) hash = NULL;
   g_autoptr(FlatpakDir) user_dir = NULL;
@@ -1448,7 +1446,6 @@ flatpak_list_unmaintained_refs (const char   *name_prefix,
                                 GError      **error)
 {
   gchar **ret = NULL;
-
   g_autoptr(GPtrArray) names = NULL;
   g_autoptr(GHashTable) hash = NULL;
   g_autoptr(FlatpakDir) user_dir = NULL;
@@ -1595,7 +1592,6 @@ flatpak_find_current_ref (const char   *app_id,
                           GError      **error)
 {
   g_autofree char *current_ref = NULL;
-
   g_autoptr(FlatpakDir) user_dir = flatpak_dir_get_user ();
   int i;
 
@@ -1633,7 +1629,6 @@ flatpak_find_deploy_for_ref_in (GPtrArray    *dirs,
 {
   FlatpakDeploy *deploy = NULL;
   int i;
-
   g_autoptr(GError) my_error = NULL;
 
   for (i = 0; deploy == NULL && i < dirs->len; i++)
@@ -1676,7 +1671,6 @@ remove_dangling_symlinks (int           parent_fd,
 {
   gboolean ret = FALSE;
   struct dirent *dent;
-
   g_auto(GLnxDirFdIterator) iter = { 0 };
 
   if (!glnx_dirfd_iterator_init_at (parent_fd, name, FALSE, &iter, error))
@@ -1961,7 +1955,6 @@ flatpak_cp_a (GFile         *src,
   gboolean merge = (flags & FLATPAK_CP_FLAGS_MERGE) != 0;
   gboolean no_chown = (flags & FLATPAK_CP_FLAGS_NO_CHOWN) != 0;
   gboolean move = (flags & FLATPAK_CP_FLAGS_MOVE) != 0;
-
   g_autoptr(GFileInfo) child_info = NULL;
   GError *temp_error = NULL;
   int r;
@@ -2905,7 +2898,6 @@ flatpak_repo_load_summary (OstreeRepo *repo,
                            GError    **error)
 {
   glnx_autofd int fd = -1;
-
   g_autoptr(GMappedFile) mfile = NULL;
   g_autoptr(GBytes) bytes = NULL;
 
@@ -3035,7 +3027,6 @@ flatpak_repo_update (OstreeRepo   *repo,
   g_autofree char *redirect_url = NULL;
   g_autofree char *default_branch = NULL;
   g_autofree char *gpg_keys = NULL;
-
   g_autoptr(GVariant) old_summary = NULL;
   g_autoptr(GVariant) new_summary = NULL;
   g_autoptr(GHashTable) refs = NULL;
@@ -3491,7 +3482,6 @@ flatpak_appstream_xml_migrate (FlatpakXml *source,
   FlatpakXml *component;
   FlatpakXml *prev_component;
   gboolean migrated = FALSE;
-
   g_auto(GStrv) tags = NULL;
   g_autofree const char *runtime = NULL;
   g_autofree const char *sdk = NULL;
@@ -3547,7 +3537,6 @@ copy_icon (const char *id,
            GError    **error)
 {
   g_autofree char *icon_name = g_strconcat (id, ".png", NULL);
-
   g_autoptr(GFile) icons_dir =
     g_file_resolve_relative_path (root,
                                   "files/share/app-info/icons/flatpak");
@@ -3815,7 +3804,6 @@ flatpak_repo_generate_appstream (OstreeRepo   *repo,
   GLNX_HASH_TABLE_FOREACH (arches, const char *, arch)
   {
     g_autofree char *tmpdir = g_strdup ("/tmp/flatpak-appstream-XXXXXX");
-
     g_autoptr(FlatpakTempDir) tmpdir_file = NULL;
     g_autoptr(GFile) appstream_file = NULL;
     g_autoptr(GFile) appstream_gz_file = NULL;
@@ -4077,7 +4065,6 @@ flatpak_extension_new (const char *id,
                        gboolean    is_unmaintained)
 {
   FlatpakExtension *ext = g_new0 (FlatpakExtension, 1);
-
   g_autoptr(GVariant) deploy_data = NULL;
 
   ext->id = g_strdup (id);
@@ -4120,7 +4107,6 @@ flatpak_extension_matches_reason (const char *extension_id,
                                   gboolean    default_value)
 {
   const char *extension_basename;
-
   g_auto(GStrv) reason_list = NULL;
   size_t i;
 
@@ -4200,7 +4186,6 @@ add_extension (GKeyFile   *metakey,
   g_autofree char *add_ld_path = g_key_file_get_string (metakey, group,
                                                         FLATPAK_METADATA_KEY_ADD_LD_PATH,
                                                         NULL);
-
   g_auto(GStrv) merge_dirs = g_key_file_get_string_list (metakey, group,
                                                          FLATPAK_METADATA_KEY_MERGE_DIRS,
                                                          NULL, NULL);
@@ -4650,7 +4635,6 @@ static guint64
 flatpak_bundle_get_installed_size (GVariant *bundle, gboolean byte_swap)
 {
   guint64 total_usize = 0;
-
   g_autoptr(GVariant) meta_entries = NULL;
   guint i, n_parts;
 
@@ -4809,7 +4793,6 @@ flatpak_pull_from_bundle (OstreeRepo   *repo,
 {
   g_autofree char *metadata_contents = NULL;
   g_autofree char *to_checksum = NULL;
-
   g_autoptr(GFile) root = NULL;
   g_autoptr(GFile) metadata_file = NULL;
   g_autoptr(GInputStream) in = NULL;
@@ -4948,7 +4931,6 @@ flatpak_mirror_image_from_oci (FlatpakOciRegistry    *dst_registry,
                                GError               **error)
 {
   FlatpakOciPullProgressData progress_data = { progress_cb, progress_user_data };
-
   g_autoptr(FlatpakOciVersioned) versioned = NULL;
   FlatpakOciManifest *manifest = NULL;
   g_autoptr(FlatpakOciDescriptor) manifest_desc = NULL;
@@ -5193,7 +5175,6 @@ flatpak_allocate_tmpdir (int           tmpdir_dfd,
   gboolean reusing_dir = FALSE;
   g_autofree char *tmpdir_name = NULL;
   glnx_autofd int tmpdir_fd = -1;
-
   g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
 
   /* Look for existing tmpdir (with same prefix) to reuse */
@@ -5693,7 +5674,6 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
   guint requested;
   guint64 total_transferred;
   g_autofree gchar *formatted_bytes_total_transferred = NULL;
-
   g_autoptr(GVariant) outstanding_fetchesv = NULL;
 
   /* We get some extra calls before we've really started due to the initialization of the
diff --git a/common/test-lib.c b/common/test-lib.c
index 348c5d9243..ddc5878c24 100644
--- a/common/test-lib.c
+++ b/common/test-lib.c
@@ -32,7 +32,6 @@ main (int argc, char *argv[])
   FlatpakInstalledRef *app1;
   FlatpakInstalledRef *app2;
   FlatpakRemoteRef *remote_ref;
-
   g_autoptr(GPtrArray) remotes = NULL;
   GError *error = NULL;
   int i, j, k;
diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c
index 6111f62961..afd248bcb4 100644
--- a/icon-validator/validate-icon.c
+++ b/icon-validator/validate-icon.c
@@ -32,7 +32,6 @@ validate_icon (const char *arg_width,
   int width, height;
   const char *name;
   const char *allowed_formats[] = { "png", "jpeg", "svg", NULL };
-
   g_autoptr(GdkPixbuf) pixbuf = NULL;
   g_autoptr(GError) error = NULL;
 
@@ -129,7 +128,6 @@ rerun_in_sandbox (const char *arg_width,
 {
   const char * const usrmerged_dirs[] = { "bin", "lib64", "lib", "sbin" };
   int i;
-
   g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
   g_autofree char *err = NULL;
   int status;
diff --git a/portal/flatpak-portal-app-info.c b/portal/flatpak-portal-app-info.c
index dfb5d867da..ac70f143de 100644
--- a/portal/flatpak-portal-app-info.c
+++ b/portal/flatpak-portal-app-info.c
@@ -75,7 +75,6 @@ parse_app_id_from_fileinfo (int pid)
   glnx_autofd int root_fd = -1;
   glnx_autofd int info_fd = -1;
   struct stat stat_buf;
-
   g_autoptr(GError) local_error = NULL;
   g_autoptr(GMappedFile) mapped = NULL;
   g_autoptr(GKeyFile) metadata = NULL;
@@ -136,7 +135,6 @@ flatpak_invocation_lookup_app_info (GDBusMethodInvocation *invocation,
 {
   GDBusConnection *connection = g_dbus_method_invocation_get_connection (invocation);
   const gchar *sender = g_dbus_method_invocation_get_sender (invocation);
-
   g_autoptr(GDBusMessage) msg = NULL;
   g_autoptr(GDBusMessage) reply = NULL;
   g_autoptr(GVariantIter) iter = NULL;
diff --git a/portal/flatpak-portal.c b/portal/flatpak-portal.c
index aa244bb94d..0f5f25e7d9 100644
--- a/portal/flatpak-portal.c
+++ b/portal/flatpak-portal.c
@@ -133,7 +133,6 @@ child_watch_died (GPid     pid,
                   gpointer user_data)
 {
   PidData *pid_data = user_data;
-
   g_autoptr(GVariant) signal_variant = NULL;
 
   g_debug ("Client Pid %d died", pid_data->pid);
@@ -850,7 +849,6 @@ main (int    argc,
   gboolean show_version;
   GOptionContext *context;
   GBusNameOwnerFlags flags;
-
   g_autoptr(GError) error = NULL;
   const GOptionEntry options[] = {
     { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace,  "Replace old daemon.", NULL },
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index 883f207668..6ba486e6a3 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -94,7 +94,6 @@ child_watch_died (GPid     pid,
                   gpointer user_data)
 {
   PidData *pid_data = user_data;
-
   g_autoptr(GVariant) signal_variant = NULL;
 
   g_debug ("Client Pid %d died", pid_data->pid);
@@ -690,7 +689,6 @@ start_p11_kit_server (const char *flatpak_dir)
   g_autofree char *socket_path = g_build_filename (flatpak_dir, socket_basename, NULL);
   g_autofree char *p11_kit_stdout = NULL;
   gint exit_status;
-
   g_autoptr(GError) local_error = NULL;
   g_auto(GStrv) stdout_lines = NULL;
   int i;
@@ -767,7 +765,6 @@ main (int    argc,
   GOptionContext *context;
   GBusNameOwnerFlags flags;
   g_autofree char *flatpak_dir = NULL;
-
   g_autoptr(GError) error = NULL;
   const GOptionEntry options[] = {
     { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace,  "Replace old daemon.", NULL },
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c
index 0edd9e1a04..34c81585a4 100644
--- a/system-helper/flatpak-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -419,7 +419,6 @@ handle_deploy (FlatpakSystemHelper   *object,
   else if (local_pull)
     {
       g_autoptr(GMainContextPopDefault) main_context = NULL;
-
       g_autoptr(FlatpakRemoteState) state = NULL;
       if (!ostree_repo_remote_get_url (flatpak_dir_get_repo (system),
                                        arg_origin,
@@ -1266,7 +1265,6 @@ flatpak_authorize_method_handler (GDBusInterfaceSkeleton *interface,
   const gchar *method_name = g_dbus_method_invocation_get_method_name (invocation);
   const gchar *sender = g_dbus_method_invocation_get_sender (invocation);
   GVariant *parameters = g_dbus_method_invocation_get_parameters (invocation);
-
   g_autoptr(AutoPolkitSubject) subject = polkit_system_bus_name_new (sender);
   g_autoptr(AutoPolkitDetails) details = polkit_details_new ();
   const gchar *action = NULL;
@@ -1600,7 +1598,6 @@ main (int    argc,
   gboolean show_version;
   GBusNameOwnerFlags flags;
   GOptionContext *context;
-
   g_autoptr(GError) error = NULL;
   const GOptionEntry options[] = {
     { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace,  "Replace old daemon.", NULL },
diff --git a/tests/testcommon.c b/tests/testcommon.c
index ab6fb14274..a36fe652b1 100644
--- a/tests/testcommon.c
+++ b/tests/testcommon.c
@@ -392,7 +392,6 @@ test_subpaths_merge (void)
   char *bla[] = { "bla", "ba", NULL };
   char *bla_sorted[] = { "ba", "bla", NULL };
   char *bubabla[] = { "ba", "bla", "bu", NULL };
-
   g_auto(GStrv) res = NULL;
 
   res = flatpak_subpaths_merge (NULL, bla);
@@ -480,7 +479,6 @@ test_parse_appdata (void)
     "    <project_license>anything goes</project_license>\n"
     "  </component>\n"
     "</components>";
-
   g_autoptr(GHashTable) names = NULL;
   g_autoptr(GHashTable) comments = NULL;
   g_autofree char *version = NULL;
@@ -610,7 +608,6 @@ test_columns (void)
   };
   Column *cols;
   g_autofree char *help = NULL;
-
   g_autoptr(GError) error = NULL;
   const char *args[3];
 
@@ -935,7 +932,6 @@ test_parse_datetime (void)
   struct timespec ts;
   struct timespec now;
   gboolean ret;
-
   g_autoptr(GDateTime) dt = NULL;
   GTimeVal tv;
 
diff --git a/tests/testlibrary.c b/tests/testlibrary.c
index 1a22ccfb85..72dd20fd71 100644
--- a/tests/testlibrary.c
+++ b/tests/testlibrary.c
@@ -133,7 +133,6 @@ test_multiple_system_installations (void)
     { "extra-installation-3", "System (extra-installation-3) installation", 0, FLATPAK_STORAGE_TYPE_DEFAULT},
     { "default", "Default system installation", 0, FLATPAK_STORAGE_TYPE_DEFAULT},
   };
-
   g_autoptr(GPtrArray) system_dirs = NULL;
   g_autoptr(GError) error = NULL;
 
@@ -693,7 +692,6 @@ test_list_refs_in_remotes (void)
 {
   const char *repo_name = "multi-refs-repo";
   g_autofree char *repo_url = NULL;
-
   g_autoptr(GPtrArray) refs1 = NULL;
   g_autoptr(GPtrArray) refs2 = NULL;
   g_autoptr(FlatpakInstallation) inst = NULL;
@@ -1223,7 +1221,6 @@ run_test_subprocess (char                 **argv,
                      RunTestSubprocessFlags flags)
 {
   int status;
-
   g_autoptr(GError) error = NULL;
   g_autofree char *argv_str = g_strjoinv (" ", argv);
   g_autofree char *output = NULL;
@@ -1343,7 +1340,6 @@ static void
 update_repo (void)
 {
   char *argv[] = { "flatpak", "build-update-repo", "--gpg-homedir=", "--gpg-sign=", "repos/test", NULL };
-
   g_auto(GStrv) gpgargs = NULL;
 
   gpgargs = g_strsplit (gpg_args, " ", 0);
@@ -1356,7 +1352,6 @@ static void
 update_repo2 (void)
 {
   char *argv[] = { "flatpak", "build-update-repo", "--gpg-homedir=", "--gpg-sign=", "repos/test-without-runtime", NULL };
-
   g_auto(GStrv) gpgargs = NULL;
 
   gpgargs = g_strsplit (gpg_args, " ", 0);
@@ -1417,7 +1412,6 @@ static void
 add_flatpakrepo (void)
 {
   g_autofree char *data = NULL;
-
   g_autoptr(GError) error = NULL;
 
   data = g_strconcat ("[Flatpak Repo]\n"
@@ -1439,7 +1433,6 @@ add_extra_installation (const char *id,
   g_autofree char *conffile_path = NULL;
   g_autofree char *contents_string = NULL;
   g_autofree char *path = NULL;
-
   g_autoptr(GPtrArray) contents_array = NULL;
   g_autoptr(GError) error = NULL;
 
@@ -1514,7 +1507,6 @@ copy_file (const char *src, const char *dest)
 {
   gchar *buffer = NULL;
   gsize length;
-
   g_autoptr(GError) error = NULL;
 
   g_test_message ("copying %s to %s", src, dest);
@@ -1809,7 +1801,6 @@ new_op (FlatpakTransaction          *transaction,
         FlatpakTransactionProgress  *progress)
 {
   g_autofree char *status = NULL;
-
   g_autoptr(FlatpakTransactionOperation) current = NULL;
   g_auto(GStrv) refs = NULL;
 
diff --git a/uncrustify.cfg b/uncrustify.cfg
index 4578f57804..0b936b8199 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -84,7 +84,6 @@ nl_func_leave_one_liners        False
 nl_if_leave_one_liners          False
 nl_end_of_file                  Add
 nl_assign_brace                 Remove
-nl_func_var_def_blk             1
 nl_fcall_brace                  Add
 nl_enum_brace                   Remove
 nl_struct_brace                 Force