Clean up some old code. Date format cleanup