removed piece and piecetype_1