In theory removed the extra RenderBlocks and RenderItem patches