upgraded to devise 2.2.2
remove stuff that should be there