Remov unused local variables