Removed static context