More cleanup, prepping for dd font