A little more cleanup of layouts and removal of unused (apparently) files.