Do not use entity info anymore for layouts
Remove storage