Remove redundant context switching