Removed unused packages, added glyphs