Cleanup logs
Some more cleanup