Deprecated date parsing in favor of the ISO8601 library
Also clean up some whitespace