Remove redundant context block