minor cleanup of unused vars