Tile deselection and a bit of cleanup