diff --git a/fflib/v1/reader_scan_amd64.go b/fflib/v1/reader_scan_amd64.go
deleted file mode 100644
index f94d55f..0000000
--- a/fflib/v1/reader_scan_amd64.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// +build amd64
-// +build !appengine
-
-/**
- *  Copyright 2014 Paul Querna
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package v1
-
-func haveSSE42() bool
-func scanStringSSE(s []byte, j int) (int, byte)
-
-var sse42 = haveSSE42()
-
-func scanString(s []byte, j int) (int, byte) {
-	// XXX The following fails to compile on Go 1.2.
-	/*
-		if false && sse42 {
-			return scanStringSSE(s, j)
-		}
-	*/
-
-	for {
-		if j >= len(s) {
-			return j, 0
-		}
-
-		c := s[j]
-		j++
-		if byteLookupTable[c]&sliceStringMask == 0 {
-			continue
-		}
-
-		return j, c
-	}
-}
diff --git a/fflib/v1/reader_scan_amd64.s b/fflib/v1/reader_scan_amd64.s
deleted file mode 100644
index f76fb98..0000000
--- a/fflib/v1/reader_scan_amd64.s
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build !appengine
-
-#define NOSPLIT 4
-
-// func scanStringSSE(s []byte, j int) (int, byte)
-TEXT scanStringSSE(SB),NOSPLIT,$0
-	// TODO: http://www.strchr.com/strcmp_and_strlen_using_sse_4.2
-	// Equal any, operand1 set to 
-	RET
-
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// func haveSSE42() bool
-TEXT ·haveSSE42(SB),NOSPLIT,$0
-	XORQ AX, AX
-	INCL AX
-	CPUID
-	SHRQ $20, CX
-	ANDQ $1, CX
-	MOVB CX, ret+0(FP)
-	RET
diff --git a/fflib/v1/reader_scan_generic.go b/fflib/v1/reader_scan_generic.go
index 4f4ce63..47c2607 100644
--- a/fflib/v1/reader_scan_generic.go
+++ b/fflib/v1/reader_scan_generic.go
@@ -1,5 +1,3 @@
-// +build !amd64 appengine
-
 /**
  *  Copyright 2014 Paul Querna
  *