Removed empty context creation