Get rid of PieceFactory