upgrading Devise 3.1
user model cleanup