Removed variables that were only used once

Overoptimisation.