Removed dependency on user model.