A bit more in Context cleanup