Clean up compiler warnings (mostly unreferenced variables)