remove more 'unused variable' warnings