Clean up a batch of warnings and excess logging output