Replaced some glyphs with references and removed some unused glyphs