Revert "More updates on the devise..."

This reverts commit 329a35244bad9456eb85662b3712fa7523d50b95.