Remove 'unused vars' warnings