diff --git a/app/controllers/carto/api/database_groups_controller.rb b/app/controllers/carto/api/database_groups_controller.rb
index 6b93e0d4d4..87228a321e 100644
--- a/app/controllers/carto/api/database_groups_controller.rb
+++ b/app/controllers/carto/api/database_groups_controller.rb
@@ -32,7 +32,7 @@ module Carto
       before_filter :load_table, :only => [:update_permission, :destroy_permission]
 
       def create
-        group = Group.new_instance(@database_name, @name, @database_role)
+        group = Carto::Group.new_instance(@database_name, @name, @database_role)
         if group.save
           render json: group.to_json
         else
@@ -173,7 +173,7 @@ module Carto
       end
 
       def get_group(database_name, name)
-        Group.where(organization_id: Carto::Organization.find_by_database_name(database_name).id, name: name).first
+        Carto::Group.where(organization_id: Carto::Organization.find_by_database_name(database_name).id, name: name).first
       end
 
       def load_mandatory_group
diff --git a/app/models/group.rb b/app/models/group.rb
deleted file mode 100644
index 7d2602825b..0000000000
--- a/app/models/group.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_dependency 'carto/helpers/auth_token_generator'
-
-class Group < Sequel::Model
-
-  include Carto::AuthTokenGenerator
-
-  def organization
-    Carto::Organization.find_by(id: organization_id) if organization_id
-  end
-
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index 05c88e2896..60c1433ee8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -49,7 +49,6 @@ class User < Sequel::Model
   }
 
   plugin :many_through_many
-  many_through_many :groups, [[:users_groups, :user_id, :group_id]]
 
   # Sequel setup & plugins
   plugin :association_dependencies, synchronization_oauths: :destroy
@@ -111,6 +110,8 @@ class User < Sequel::Model
   def self_feature_flags
     Carto::FeatureFlag.where(id: self_feature_flags_user.pluck(:feature_flag_id))
   end
+
+  delegate :groups, to: :carto_user
   ## ./AR compatibility until User is migrated
 
   def db_service
diff --git a/app/services/carto/organization_metadata_export_service.rb b/app/services/carto/organization_metadata_export_service.rb
index 19d0de2e46..70a9bbb6de 100644
--- a/app/services/carto/organization_metadata_export_service.rb
+++ b/app/services/carto/organization_metadata_export_service.rb
@@ -81,7 +81,7 @@ module Carto
     end
 
     def build_group_from_hash(exported_group)
-      g = Group.new_instance_without_validation(
+      g = Carto::Group.new_instance_without_validation(
         name: exported_group[:name],
         display_name: exported_group[:display_name],
         database_role: exported_group[:database_role],