Remove unneeded context variable