Cleanup of the Architecture section.