[indicator-datetime] Cleanup and rebuild