ACTN-18 - jin - cleaning up font manager