Cleaning up a few things like ...

… removal of an unused variable.