More little bits of clean up.
Got rid of architecture layout.