Cleanup some extra logging