[PATCH] Char: n_r3964, cleanup