also clean up some extra logging