tested with x86 and amd64 - removing the old stuff