Couple logging fixes and ditching those file that should never have gotten here.