Removing unnecessary PieceLocationAdapters