Resolve memory leak in OTP