diff --git a/admin/admin-domain-service/ballerina/organizationDAO.bal b/admin/admin-domain-service/ballerina/organizationDAO.bal
index 9398e2e82..9d74b9a1c 100644
--- a/admin/admin-domain-service/ballerina/organizationDAO.bal
+++ b/admin/admin-domain-service/ballerina/organizationDAO.bal
@@ -58,7 +58,6 @@ isolated function addOrganizationClaimMappingDAO(postgresql:Client dbClient, Int
     return payload;
 }
 
-// TODO: Add error handling
 isolated function addVhostsDAO (postgresql:Client dbClient, Internal_Organization payload) returns boolean{
     string[]? production = payload.production;
     string[]? sandbox = payload.sandbox;
diff --git a/backoffice/backoffice-domain-service/ballerina/backoffice_dao.bal b/backoffice/backoffice-domain-service/ballerina/backoffice_dao.bal
index aff3694b3..1959f11ed 100644
--- a/backoffice/backoffice-domain-service/ballerina/backoffice_dao.bal
+++ b/backoffice/backoffice-domain-service/ballerina/backoffice_dao.bal
@@ -43,7 +43,6 @@ isolated function db_getAPIsDAO(string organization) returns API[]|commons:APKEr
     }
 }
 
-// Change Lifecycle State
 isolated function db_changeLCState(string targetState, string apiId) returns string|commons:APKError {
     postgresql:Client|error db_Client = getConnection();
     if db_Client is error {