Remove stray architechture_independent flags