Remove unused fonts, remove unneeded TODO, save gfx state earlier.