Clean up BlockCC and add TileCC.