Clean-up of the `architecture' class