diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b7611aa..a83cc57 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -31,26 +31,26 @@ class UsersController < AdminController
   end
 
   def set_admin_role
-    @person = environment.people.find(params[:id])
-    environment.add_admin(@person)
+    person = environment.people.find(params[:id])
+    environment.add_admin(person)
     redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
   end
 
   def reset_admin_role
-    @person = environment.people.find(params[:id])
-    environment.remove_admin(@person)
+    person = environment.people.find(params[:id])
+    environment.remove_admin(person)
     redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
   end
 
   def activate
-    @person = environment.people.find(params[:id])
-    @person.user.activate
+    person = environment.people.find(params[:id])
+    person.user.activate
     redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
   end
 
   def deactivate
-    @person = environment.people.find(params[:id])
-    @person.user.deactivate
+    person = environment.people.find(params[:id])
+    person.user.deactivate
     redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
   end
 
@@ -58,8 +58,8 @@ class UsersController < AdminController
     respond_to do |format|
       format.html
       format.xml do
-        @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
-        send_data @users.to_xml(
+        users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
+        send_data users.to_xml(
             :skip_types => true,
             :only => %w[email login created_at updated_at],
             :include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),
diff --git a/app/controllers/admin/xxx-environment_users_controller.rb b/app/controllers/admin/xxx-environment_users_controller.rb
deleted file mode 100644
index 1302cf1..0000000
--- a/app/controllers/admin/xxx-environment_users_controller.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-class EnvironmentUsersController < AdminController
-
-  protect 'manage_environment_users', :environment
-
-  def per_page
-    10
-  end
-
-  def index
-    @q = params[:q]
-    if @q.blank?
-      @collection = environment.people.no_templates(environment).paginate(
-        :per_page => per_page,
-        :page => params[:npage]
-      )
-    else
-      @collection = find_by_contents(:people, environment.people.no_templates(environment), @q, {:per_page => per_page, :page => params[:npage]})[:results]
-    end
-  end
-
-  def set_admin_role
-    @person = environment.people.find(params[:id])
-    environment.add_admin(@person)
-    redirect_to :action => :index, :q => params[:q]
-  end
-
-  def reset_admin_role
-    @person = environment.people.find(params[:id])
-    environment.remove_admin(@person)
-    redirect_to :action => :index, :q => params[:q]
-  end
-
-  def activate
-    @person = environment.people.find(params[:id])
-    @person.user.activate
-    redirect_to :action => :index, :q => params[:q]
-  end
-
-  def deactivate
-    @person = environment.people.find(params[:id])
-    @person.user.deactivate
-    redirect_to :action => :index, :q => params[:q]
-  end
-end
diff --git a/app/views/users/_users_list.rhtml b/app/views/users/_users_list.rhtml
index 92ce21c..34047b4 100644
--- a/app/views/users/_users_list.rhtml
+++ b/app/views/users/_users_list.rhtml
@@ -30,4 +30,4 @@
   <% end %>
 </table>
 
-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
\ No newline at end of file
+<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 295151f..4eb7058 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -11,6 +11,9 @@ class UsersControllerTest < ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
 
+    
+    Environment.delete_all
+    Environment.create(:name => 'some env', :is_default => true)
     admin_user = create_user_with_permission('adminuser', 'manage_environment_users', Environment.default)
     login_as('adminuser')
   end
--
libgit2 0.21.2