Remove redundant context creation