Remove old, terribly slow, and rather redundant activity origin tracking