Removing reinvented context methods, again