More fonts cleanup