[PATCH] Char: moxa, variables cleanup