rolled back devise edits