Remove unneeded variables in the context

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>