Cleanup - Unused local variables