Remove uneeded iso8061 usages