cleanup some unused variables
Merge commit 'f2c42951a6b2e6f8e10e690eb3c13178cb291e48'