cleaning up past/futureFormats
cleaning up past/futureFormats


Former-commit-id: 97a033c35d0ac0d0a38053ea8b0baab8319a437e [formerly 6aaa62bea5771304820a3ad406aac2dd57ac60cc]
Former-commit-id: 1cfc0575aa07a825d68242405f2bac655197dbad
romancow/Sugar,andrewplummer/Sugar,romancow/Sugar,andrewplummer/Sugar