Clean couple unused vars warnings.