Eradicate some unused vars/types.