removed method specific code from Context