diff --git a/app/Models/Account.php b/app/Models/Account.php
index f86460a79435..ecf99aba847d 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1,6 +1,7 @@
 <?php  namespace App\Models;
 
 use Eloquent;
+use Utils;
 
 class Account extends Eloquent
 {
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index 4b06532845a8..aa20221160de 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Activity extends Eloquent
 {
     public $timestamps = true;
diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index e9e34cd00927..4f98b39f4f2f 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -1,5 +1,9 @@
 <?php namespace App\Models;
 
+use Auth;
+use Eloquent;
+use Utils;
+
 class EntityModel extends Eloquent
 {
     protected $softDelete = true;
diff --git a/app/Models/User.php b/app/Models/User.php
index 27dd24e1a04a..30b76ccd6533 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -1,24 +1,12 @@
 <?php namespace App\Models;
 
 use Eloquent;
-// use Illuminate\Auth\UserInterface;
-// use Illuminate\Auth\Reminders\RemindableInterface;
+use Utils;
 use Zizaco\Confide\ConfideUser;
-
-// use Illuminate\Auth\Authenticatable;
-// use Illuminate\Auth\Passwords\CanResetPassword;
-// use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
-// use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
-
-
-// use Zizaco\Confide\ConfideUser;
 use Zizaco\Confide\ConfideUserInterface;
 
 class User extends Eloquent implements ConfideUserInterface {
 
-// class User extends ConfideUser implements UserInterface, RemindableInterface {
-
-    // use Authenticatable, CanResetPassword;
     use ConfideUser;
 
     protected $softDelete = true;
@@ -48,12 +36,12 @@ class User extends Eloquent implements ConfideUserInterface {
 
     public function account()
     {
-        return $this->belongsTo('Account');
+        return $this->belongsTo('App\Models\Account');
     }
 
     public function theme()
     {
-        return $this->belongsTo('Theme');
+        return $this->belongsTo('App\Models\Theme');
     }
 
     public function getPersonType()