Clean up dates