Fixed double OTP call, use of  and unused variables
Merge commit 'f7c7ff0da26e7c9399858ceb3d3c56b7e856ae17'