Merge "remove (dead) Font code"