Follow fix and removing unused variables

Exactly what it says on the tin.