Revert "cleanup and possible font fix"

This reverts commit cbd61a181349fdc955b4af30b2cc2bca05731f5b.