Merge "Clean up date picker"