edits for Devise cleanup