diff -r 4dcfb4c58b6d -r d726e4b46c33 src/chess/knight.c
--- a/src/chess/knight.c	Thu Apr 17 12:16:14 2014 +0200
+++ b/src/chess/knight.c	Wed May 28 15:47:57 2014 +0200
@@ -37,98 +37,3 @@
     
     return (dx == 2 && dy == 1) || (dx == 1 && dy == 2);
 }
-
-static int knight_getloc_fixedrow(GameState *gamestate, Move *move) {
-    int d = 3 - abs(move->fromrow - move->torow);
-    
-    if (d == 1 || d == 2) {
-        if (move->tofile < 6 &&
-            gamestate->board[move->fromrow][move->tofile + d] == move->piece) {
-            if (move->fromfile == POS_UNSPECIFIED) {
-                move->fromfile = move->tofile + d;
-                return VALID_MOVE_SYNTAX;
-            } else {
-                return AMBIGUOUS_MOVE;
-            }
-        }
-        if (move->tofile > 1 &&
-            gamestate->board[move->fromrow][move->tofile - d] == move->piece) {
-            if (move->fromfile == POS_UNSPECIFIED) {
-                move->fromfile = move->tofile - d;
-                return VALID_MOVE_SYNTAX;
-            } else {
-                return AMBIGUOUS_MOVE;
-            }
-        }
-    }
-    
-    return INVALID_POSITION;
-}
-
-static int knight_getloc_fixedfile(GameState *gamestate, Move *move) {
-    int d = 3 - abs(move->fromfile - move->tofile);
-    
-    if (d == 1 || d == 2) {
-        if (move->torow < 6 &&
-            gamestate->board[move->torow + d][move->fromfile] == move->piece) {
-            if (move->fromrow == POS_UNSPECIFIED) {
-                move->fromrow = move->torow + d;
-                return VALID_MOVE_SYNTAX;
-            } else {
-                return AMBIGUOUS_MOVE;
-            }
-        }
-        if (move->torow > 1 &&
-            gamestate->board[move->torow - d][move->fromfile] == move->piece) {
-            if (move->fromrow == POS_UNSPECIFIED) {
-                move->fromrow = move->torow - d;
-                return VALID_MOVE_SYNTAX;
-            } else {
-                return AMBIGUOUS_MOVE;
-            }
-        }
-    }
-    
-    return INVALID_POSITION;
-}
-
-int knight_getlocation(GameState *gamestate, Move *move) {
-    
-    if (move->fromfile != POS_UNSPECIFIED) {
-        return knight_getloc_fixedfile(gamestate, move);
-    }
-    
-    if (move->fromrow != POS_UNSPECIFIED) {
-        return knight_getloc_fixedrow(gamestate, move);
-    }
-    
-    for (int x = -2 ; x <= 2 ; x++) {
-        if (x == 0) {
-            continue;
-        }
-        for (int y = -2 ; y <= 2 ; y++) {
-            if (y == 0 || y == x) {
-                continue;
-            }
-            uint8_t cx = move->tofile + x;
-            uint8_t cy = move->torow + y;
-
-            if (isidx(cx) && isidx(cy)
-                && gamestate->board[cy][cx] == move->piece) {
-                if (move->fromfile == POS_UNSPECIFIED
-                    && move->fromrow == POS_UNSPECIFIED) {
-                    move->fromfile = cx;
-                    move->fromrow = cy;
-                } else {
-                    return AMBIGUOUS_MOVE;
-                }
-            }
-        }
-    }
-    
-    if (move->fromfile == POS_UNSPECIFIED || move->fromrow == POS_UNSPECIFIED) {
-        return INVALID_POSITION;
-    } else {
-        return VALID_MOVE_SYNTAX;
-    }
-}