Clean up un-needed date variables, include str.