Removing getter type stuff from contexts