Remove dead code, old prints, and reformat