diff --git a/scripts-available/CDB_FederatedServer.sql b/scripts-available/CDB_FederatedServer.sql
index 43401f7..f5971d5 100644
--- a/scripts-available/CDB_FederatedServer.sql
+++ b/scripts-available/CDB_FederatedServer.sql
@@ -278,8 +278,6 @@ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 --
 -- List registered servers
 -- 
--- TODO: Decide whether we want to show extra config (extensions, fetch_size, use_remote_estimate)
--- TODO: Handle multiple user mappings in the same server
 CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Server_List_Servers(server TEXT DEFAULT '%')
 RETURNS TABLE (
     name        text,
diff --git a/scripts-available/CDB_FederatedServerListRemote.sql b/scripts-available/CDB_FederatedServerListRemote.sql
index 7cc3fb4..0b00f24 100644
--- a/scripts-available/CDB_FederatedServerListRemote.sql
+++ b/scripts-available/CDB_FederatedServerListRemote.sql
@@ -133,7 +133,7 @@ CREATE OR REPLACE FUNCTION @extschema@.__CDB_FS_List_Foreign_Geometry_Columns_PG
 RETURNS TABLE(column_name name, column_type text)
 AS $func$
 DECLARE
-    -- Import `geometry_columns` and geography_columns from the postgis schema
+    -- Import `geometry_columns` and `geography_columns` from the postgis schema
     -- We assume that postgis is installed in the public schema
 
     -- Create local target schema if it does not exists
@@ -220,6 +220,9 @@ END
 $$
 LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
+--
+-- List the columns of a remote table in a federated server that the current user has access to.
+--
 CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Server_List_Remote_Columns(
     server TEXT,
     remote_schema TEXT,
diff --git a/scripts-available/CDB_Groups_API.sql b/scripts-available/CDB_Groups_API.sql
index 660d4e8..b29eb77 100644
--- a/scripts-available/CDB_Groups_API.sql
+++ b/scripts-available/CDB_Groups_API.sql
@@ -5,7 +5,6 @@
 -- Requires configuration parameter. Example: SELECT @extschema@.CDB_Conf_SetConf('groups_api', '{ "host": "127.0.0.1", "port": 3000, "timeout": 10, "username": "extension", "password": "elephant" }');
 ----------------------------------
 
--- TODO: delete this development cleanup before final merge
 DROP FUNCTION IF EXISTS @extschema@.CDB_Group_AddMember(group_name text, username text);
 DROP FUNCTION IF EXISTS @extschema@.CDB_Group_RemoveMember(group_name text, username text);
 DROP FUNCTION IF EXISTS @extschema@._CDB_Group_AddMember_API(group_name text, username text);