Get rid of $architecture