Removed a little more crap, introduced a tiny bit more on the road to recovery.
Merged the two other context vars into a context map with batch-inserter