Minor tidy-up.  Remove unused vars