Cleanup unused local variables