Deprecate old mutliarch code, phase 1