Fix encryptpassword bug
Remove unused comment