Remove Piece class for now