tidied up up a few unused-variable warnings