Adding Devise functionality and clean up steps