[Core, Grapheme] Massive cleanup.