diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index d83e95cf097603cb9d160c6358da6d0c0bde2550..6060ddf025b9e44137348b586c599dcdd4d731de 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -16,20 +16,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
 
     @project_members = @project_members.order('access_level DESC')
 
-    @group = @project.group
-
-    if @group
-      @group_members = @group.group_members
-      @group_members = @group_members.non_invite unless can?(current_user, :admin_group, @group)
-
-      if params[:search].present?
-        users = @group.users.search(params[:search]).to_a
-        @group_members = @group_members.where(user_id: users)
-      end
-
-      @group_members = @group_members.order('access_level DESC')
-    end
-
     @requesters = @project.requesters if can?(current_user, :admin_project, @project)
 
     @project_member = @project.project_members.new
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index db8a060d170c490958d03c1b3909a8a5c02aa087..42a23057ff1759961a3c0714b80205b6ad0a3154 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -21,9 +21,7 @@
       .form-group
         = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
         = icon("search")
-  - if @grups
+  - if @groups.size > 0
     = render 'groups', groups: @groups
-  = render 'team', members: @project_members
 
-  - if @group
-    = render "group_members", members: @group_members
+  = render 'team', members: @project_members