Remove unnecessary code for x86