Clean up unused variables & warnings about them