remove fixed path which should not be in VCS
Add x86 support