Remove old potentially broken architecture specific legacy code