Remove foo layout.
Fixups