- Added remember me
- Cleanup