And drop a load of unused variables.

Fixes commit 5040cf19

.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>