x86: Remove some conditional compilation