Remove unused variable
More progress towards being able to compile as C++ ...