some additional clean ups.  code is there, but no hooks to remove fonts if needed.