Remove old date conversion code
Remove more hardcoded proceeding numbers
Remove old datastore fields