Remove iconv and comments, add time to dump-1000