Forgot Password implementation and code cleanup