remove x86 support, fix some error