Removing unused methods
Rewriting Piece as a set of singletons