Remove context blocks to simplify