Remove some old layout cruft