Cleanup some logging stuff
Remove redundant code