Code cleanup - removing unused imports and fixing other warnings.
Update for password reset completed e-mail.