Cleaned up some old layouts