Cleanup: some logging calls