Cleaning up font source repair