Remove unused variable, make that code a bit more c++11 compliant.